diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index af796b0d2ed1..c5fc5aa8a68f 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -104,7 +104,13 @@
       </node>
       <node oor:name=".uno:FreezePanes" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Freeze ~Rows and Columns</value>
+          <value xml:lang="en-US">Freeze Panes</value>
+        </prop>
+        <prop oor:name="ContextLabel" oor:type="xs:string">
+          <value xml:lang="en-US">Freeze Rows and Columns</value>
+        </prop>
+        <prop oor:name="TooltipLabel" oor:type="xs:string">
+          <value xml:lang="en-US">Freeze Rows and Columns</value>
         </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>
diff --git a/sc/uiconfig/scalc/popupmenu/freezepanes.xml b/sc/uiconfig/scalc/popupmenu/freezepanes.xml
index de32001b8fa1..85a5670c8509 100644
--- a/sc/uiconfig/scalc/popupmenu/freezepanes.xml
+++ b/sc/uiconfig/scalc/popupmenu/freezepanes.xml
@@ -8,6 +8,7 @@
  *
 -->
 <menu:menupopup xmlns:menu="http://openoffice.org/2001/menu">
+  <menu:menuitem menu:id=".uno:FreezePanes"/>
   <menu:menuitem menu:id=".uno:FreezePanesColumn"/>
   <menu:menuitem menu:id=".uno:FreezePanesRow"/>
 </menu:menupopup>
diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui b/sc/uiconfig/scalc/ui/notebookbar.ui
index 304440b77467..f0749244a2db 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.2 -->
+<!-- Generated with glade 3.40.0 -->
 <interface domain="sc">
   <requires lib="gtk+" version="3.20"/>
   <requires lib="LibreOffice" version="1.0"/>
@@ -2113,6 +2113,7 @@
     <property name="can_focus">False</property>
     <property name="pixbuf">cmd/lc_insertfieldctrl.png</property>
   </object>
+  <!-- n-columns=3 n-rows=3 -->
   <object class="GtkGrid" id="NotebookBar">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -2155,6 +2156,7 @@
                             <child>
                               <object class="GtkMenuToolButton" id="File-AddDirect">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:AddDirect</property>
                               </object>
                               <packing>
@@ -2197,6 +2199,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="File-NewDoc1">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:NewDoc</property>
                                     <property name="use_underline">True</property>
                                   </object>
@@ -2221,6 +2224,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="File-SaveAsTemplate1">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:SaveAsTemplate</property>
                                     <property name="use_underline">True</property>
                                   </object>
@@ -2286,6 +2290,7 @@
                             <child>
                               <object class="GtkToolButton" id="File-Open">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:Open</property>
                                 <property name="use_underline">True</property>
                               </object>
@@ -2345,6 +2350,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="File-OpenRemote1">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:OpenRemote</property>
                                     <property name="use_underline">True</property>
                                   </object>
@@ -2410,6 +2416,7 @@
                             <child>
                               <object class="GtkToolButton" id="File-Save">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:Save</property>
                                 <property name="use_underline">True</property>
                               </object>
@@ -2453,6 +2460,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="File-SaveAs1">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:SaveAs</property>
                                     <property name="use_underline">True</property>
                                   </object>
@@ -2477,6 +2485,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="File-SaveAsRemote1">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:SaveAsRemote</property>
                                     <property name="use_underline">True</property>
                                   </object>
@@ -2542,6 +2551,7 @@
                             <child>
                               <object class="GtkToolButton" id="File-ExportTo">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:ExportTo</property>
                                 <property name="use_underline">True</property>
                               </object>
@@ -2585,6 +2595,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="File-ExportDirectToPDF1">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ExportDirectToPDF</property>
                                     <property name="use_underline">True</property>
                                   </object>
@@ -2609,6 +2620,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="File-SendMail">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:SendMail</property>
                                     <property name="use_underline">True</property>
                                   </object>
@@ -2674,6 +2686,7 @@
                             <child>
                               <object class="GtkToolButton" id="File-Print">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:Print</property>
                                 <property name="use_underline">True</property>
                               </object>
@@ -2717,6 +2730,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="File-PrintDefault1">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:PrintDefault</property>
                                     <property name="use_underline">True</property>
                                   </object>
@@ -2741,6 +2755,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="File-PrintPreview1">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:PrintPreview</property>
                                     <property name="use_underline">True</property>
                                   </object>
@@ -2806,6 +2821,7 @@
                             <child>
                               <object class="GtkToolButton" id="File-SetDocumentProperties">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:SetDocumentProperties</property>
                                 <property name="use_underline">True</property>
                               </object>
@@ -2849,6 +2865,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="File-Signature1">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Signature</property>
                                     <property name="use_underline">True</property>
                                   </object>
@@ -2873,6 +2890,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="File-SignPDF1">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:SignPDF</property>
                                     <property name="use_underline">True</property>
                                   </object>
@@ -2938,6 +2956,7 @@
                             <child>
                               <object class="GtkToolButton" id="File-CloseDoc">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:CloseDoc</property>
                               </object>
                               <packing>
@@ -2964,6 +2983,7 @@
                             <child>
                               <object class="GtkToolButton" id="File-HelpIndex">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:HelpIndex</property>
                               </object>
                               <packing>
@@ -3104,6 +3124,7 @@
                             <child>
                               <object class="GtkMenuToolButton" id="Home-Paste">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:Paste</property>
                               </object>
                               <packing>
@@ -3133,6 +3154,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Home-Cut">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Cut</property>
                                   </object>
                                   <packing>
@@ -3156,6 +3178,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Home-Copy">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Copy</property>
                                   </object>
                                   <packing>
@@ -3225,6 +3248,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Home-FormatPaintbrush">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:FormatPaintbrush</property>
                                   </object>
                                   <packing>
@@ -3250,6 +3274,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Home-ResetAttributes">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ResetAttributes</property>
                                   </object>
                                   <packing>
@@ -3313,6 +3338,7 @@
                                         <child>
                                           <object class="GtkToolButton" id="Home-CharFontName">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                             <property name="hexpand">True</property>
                                             <property name="action_name">.uno:CharFontName</property>
                                           </object>
@@ -3333,11 +3359,12 @@
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="valign">center</property>
-                                        <property name="margin_start">5</property>
+                                        <property name="margi_start">5</property>
                                         <property name="margin_end">5</property>
                                         <child>
                                           <object class="GtkToolButton" id="Home-FontHeight">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                             <property name="action_name">.uno:FontHeight</property>
                                           </object>
                                           <packing>
@@ -3362,6 +3389,7 @@
                                         <child>
                                           <object class="GtkToolButton" id="Home-Grow">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                             <property name="action_name">.uno:Grow</property>
                                           </object>
                                           <packing>
@@ -3372,6 +3400,7 @@
                                         <child>
                                           <object class="GtkToolButton" id="Home-Shrink">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                             <property name="action_name">.uno:Shrink</property>
                                           </object>
                                           <packing>
@@ -3409,6 +3438,7 @@
                                         <child>
                                           <object class="GtkToolButton" id="Home-Bold">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                             <property name="action_name">.uno:Bold</property>
                                           </object>
                                           <packing>
@@ -3419,6 +3449,7 @@
                                         <child>
                                           <object class="GtkToolButton" id="Home-Italic">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                             <property name="action_name">.uno:Italic</property>
                                           </object>
                                           <packing>
@@ -3429,6 +3460,7 @@
                                         <child>
                                           <object class="GtkToolButton" id="Home-Underline">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                             <property name="action_name">.uno:Underline</property>
                                           </object>
                                           <packing>
@@ -3439,6 +3471,7 @@
                                         <child>
                                           <object class="GtkToolButton" id="Home-Strikeout">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                             <property name="action_name">.uno:Strikeout</property>
                                           </object>
                                           <packing>
@@ -3479,6 +3512,7 @@
                                         <child>
                                           <object class="GtkToolButton" id="Home-SubScript">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                             <property name="action_name">.uno:SubScript</property>
                                           </object>
                                           <packing>
@@ -3489,6 +3523,7 @@
                                         <child>
                                           <object class="GtkToolButton" id="Home-SuperScript">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                             <property name="action_name">.uno:SuperScript</property>
                                           </object>
                                           <packing>
@@ -3528,7 +3563,8 @@
                                         <child>
                                           <object class="GtkMenuToolButton" id="Home-SetBorderStyle">
                                             <property name="visible">True</property>
-                                            <property name="tooltip_text" translatable="yes" context="CalcNotebookbar|bordertype|tooltip_text">Specify the borders of the selected cells.</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="toolti_text" translatable="yes" context="CalcNotebookbar|bordertype|tooltip_text">Specify the borders of the selected cells.</property>
                                             <property name="halign">start</property>
                                             <property name="action_name">.uno:SetBorderStyle</property>
                                           </object>
@@ -3540,6 +3576,7 @@
                                         <child>
                                           <object class="GtkMenuToolButton" id="Home-BackgroundColor">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                             <property name="action_name">.uno:BackgroundColor</property>
                                             <property name="use_underline">True</property>
                                           </object>
@@ -3551,6 +3588,7 @@
                                         <child>
                                           <object class="GtkMenuToolButton" id="Home-FontColor">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                             <property name="action_name">.uno:Color</property>
                                           </object>
                                           <packing>
@@ -3636,6 +3674,7 @@
                                     <child>
                                       <object class="GtkToolButton" id="Home-AlignTop">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="action_name">.uno:AlignTop</property>
                                       </object>
                                       <packing>
@@ -3646,6 +3685,7 @@
                                     <child>
                                       <object class="GtkToolButton" id="Home-AlignVCenter">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="action_name">.uno:AlignVCenter</property>
                                       </object>
                                       <packing>
@@ -3656,6 +3696,7 @@
                                     <child>
                                       <object class="GtkToolButton" id="Home-AlignBottom">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="action_name">.uno:AlignBottom</property>
                                       </object>
                                       <packing>
@@ -3693,6 +3734,7 @@
                                     <child>
                                       <object class="GtkToolButton" id="Home-AlignLeft">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="action_name">.uno:AlignLeft</property>
                                       </object>
                                       <packing>
@@ -3703,6 +3745,7 @@
                                     <child>
                                       <object class="GtkToolButton" id="Home-AlignHorizontalCenter">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="action_name">.uno:AlignHorizontalCenter</property>
                                       </object>
                                       <packing>
@@ -3713,6 +3756,7 @@
                                     <child>
                                       <object class="GtkToolButton" id="Home-AlignRight">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="action_name">.uno:AlignRight</property>
                                       </object>
                                       <packing>
@@ -3793,6 +3837,7 @@
                                     <property name="show_arrow">False</property>
                                     <child>
                                       <object class="GtkMenuToolButton" id="Home-Spacing">
+                                        <property name="can_focus">False</property>
                                         <property name="is_important">True</property>
                                         <property name="action_name">.uno:Spacing</property>
                                         <property name="use_underline">True</property>
@@ -3805,7 +3850,8 @@
                                     <child>
                                       <object class="GtkToolButton" id="Home-IncrementIndent">
                                         <property name="visible">True</property>
-                                        <property name="tooltip_text" translatable="yes" context="CalcNotebookbar|increaseindent1|tooltip_text">Increase Indent</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="toolti_text" translatable="yes" context="CalcNotebookbar|increaseindent1|tooltip_text">Increase Indent</property>
                                         <property name="is_important">True</property>
                                         <property name="action_name">.uno:IncrementIndent</property>
                                         <property name="use_underline">True</property>
@@ -3818,7 +3864,8 @@
                                     <child>
                                       <object class="GtkToolButton" id="Home-DecrementIndent">
                                         <property name="visible">True</property>
-                                        <property name="tooltip_text" translatable="yes" context="CalcNotebookbar|decreaseindent1|tooltip_text">Decrease Indent</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="toolti_text" translatable="yes" context="CalcNotebookbar|decreaseindent1|tooltip_text">Decrease Indent</property>
                                         <property name="is_important">True</property>
                                         <property name="action_name">.uno:DecrementIndent</property>
                                         <property name="use_underline">True</property>
@@ -3858,6 +3905,7 @@
                                     <child>
                                       <object class="GtkToolButton" id="Home-AlignBlock">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="action_name">.uno:AlignBlock</property>
                                       </object>
                                       <packing>
@@ -3897,6 +3945,7 @@
                                     <child>
                                       <object class="GtkToolButton" id="Home-WrapText">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="action_name">.uno:WrapText</property>
                                       </object>
                                       <packing>
@@ -3978,6 +4027,7 @@
                                     <child>
                                       <object class="GtkToolButton" id="Home-NumberFormatType">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="action_name">.uno:NumberFormatType</property>
                                       </object>
                                       <packing>
@@ -4015,6 +4065,7 @@
                                     <child>
                                       <object class="GtkMenuToolButton" id="Home-NumberFormatCurrency">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="action_name">.uno:NumberFormatCurrency</property>
                                       </object>
                                       <packing>
@@ -4025,6 +4076,7 @@
                                     <child>
                                       <object class="GtkToolButton" id="Home-NumberFormatPercent">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="halign">center</property>
                                         <property name="hexpand">True</property>
                                         <property name="action_name">.uno:NumberFormatPercent</property>
@@ -4037,6 +4089,7 @@
                                     <child>
                                       <object class="GtkToolButton" id="Home-NumberFormatDecimal">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="halign">center</property>
                                         <property name="hexpand">True</property>
                                         <property name="action_name">.uno:NumberFormatDecimal</property>
@@ -4078,6 +4131,7 @@
                                     <child>
                                       <object class="GtkToolButton" id="Home-NumberFormatIncDecimals">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="action_name">.uno:NumberFormatIncDecimals</property>
                                       </object>
                                       <packing>
@@ -4088,6 +4142,7 @@
                                     <child>
                                       <object class="GtkToolButton" id="Home-NumberFormatDecDecimals">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="action_name">.uno:NumberFormatDecDecimals</property>
                                       </object>
                                       <packing>
@@ -4159,6 +4214,7 @@
                             <child>
                               <object class="GtkToolButton" id="Home-MergeCells">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:ToggleMergeCells</property>
                               </object>
                               <packing>
@@ -4206,6 +4262,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Home-InsertRowsBefore">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:InsertRowsBefore</property>
                                   </object>
                                   <packing>
@@ -4216,6 +4273,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Home-DeleteRows">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:DeleteRows</property>
                                   </object>
                                   <packing>
@@ -4226,6 +4284,7 @@
                                 <child>
                                   <object class="GtkMenuToolButton" id="Home-RowOperations">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:RowOperations</property>
                                   </object>
                                   <packing>
@@ -4251,6 +4310,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Home-InsertColumnsBefore">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:InsertColumnsBefore</property>
                                   </object>
                                   <packing>
@@ -4261,6 +4321,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Home-DeleteColumns">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:DeleteColumns</property>
                                   </object>
                                   <packing>
@@ -4271,6 +4332,7 @@
                                 <child>
                                   <object class="GtkMenuToolButton" id="Home-ColumnOperations">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ColumnOperations</property>
                                   </object>
                                   <packing>
@@ -4336,6 +4398,7 @@
                             <child>
                               <object class="GtkMenuToolButton" id="Home-ConditionalFormatMenu">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:ConditionalFormatMenu</property>
                               </object>
                               <packing>
@@ -4387,6 +4450,7 @@
                                     <child>
                                       <object class="GtkToolButton" id="Home-StyleApply">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="halign">center</property>
                                         <property name="hexpand">True</property>
                                         <property name="action_name">.uno:StyleApply</property>
@@ -4425,6 +4489,7 @@
                                     <child>
                                       <object class="GtkToolButton" id="Home-StandardStyle">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="action_name">.uno:StyleApply?Style:string=Default&amp;FamilyName:string=CellStyles</property>
                                         <property name="icon_name">cmd/sc_defaultcharstyle.png</property>
                                       </object>
@@ -4451,6 +4516,7 @@
                                     <child>
                                       <object class="GtkToolButton" id="Home-H1Style">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="action_name">.uno:StyleApply?Style:string=Heading 1&amp;FamilyName:string=CellStyles</property>
                                         <property name="icon_name">cmd/sc_heading1parastyle.png</property>
                                       </object>
@@ -4462,6 +4528,7 @@
                                     <child>
                                       <object class="GtkToolButton" id="Home-H2Style">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="action_name">.uno:StyleApply?Style:string=Heading 2&amp;FamilyName:string=CellStyles</property>
                                         <property name="icon_name">cmd/sc_heading2parastyle.png</property>
                                       </object>
@@ -4503,6 +4570,7 @@
                                     <child>
                                       <object class="GtkToolButton" id="Home-GoodStyle">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="action_name">.uno:StyleApply?Style:string=Good&amp;FamilyName:string=CellStyles</property>
                                         <property name="icon_name">cmd/sc_goodcellstyle.png</property>
                                       </object>
@@ -4514,6 +4582,7 @@
                                     <child>
                                       <object class="GtkToolButton" id="Home-NeutralStyle">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="action_name">.uno:StyleApply?Style:string=Neutral&amp;FamilyName:string=CellStyles</property>
                                         <property name="icon_name">cmd/sc_neutralcellstyle.png</property>
                                       </object>
@@ -4525,6 +4594,7 @@
                                     <child>
                                       <object class="GtkToolButton" id="Home-BadStyle">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="action_name">.uno:StyleApply?Style:string=Bad&amp;FamilyName:string=CellStyles</property>
                                         <property name="icon_name">cmd/sc_badcellstyle.png</property>
                                       </object>
@@ -4600,6 +4670,7 @@
                             <child>
                               <object class="GtkToolButton" id="SearchDialog">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:SearchDialog</property>
                               </object>
                               <packing>
@@ -4645,6 +4716,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Home-SortAscending2">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="valign">center</property>
                                     <property name="action_name">.uno:DataSort</property>
                                   </object>
@@ -4669,6 +4741,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Home-DataFilterAutoFilter2">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="valign">center</property>
                                     <property name="action_name">.uno:DataFilterAutoFilter</property>
                                   </object>
@@ -4753,6 +4826,7 @@
                             <child>
                               <object class="GtkToolButton" id="Home-SearchDialog">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:SearchDialog</property>
                               </object>
                               <packing>
@@ -4763,6 +4837,7 @@
                             <child>
                               <object class="GtkToolButton" id="Home-SortAscending">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="valign">center</property>
                                 <property name="action_name">.uno:SortAscending</property>
                               </object>
@@ -4774,6 +4849,7 @@
                             <child>
                               <object class="GtkToolButton" id="Home-DataFilterAutoFilter">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="valign">center</property>
                                 <property name="action_name">.uno:DataFilterAutoFilter</property>
                               </object>
@@ -4872,7 +4948,8 @@
                             <child>
                               <object class="GtkToolButton" id="Insert-DataDataPilotRun">
                                 <property name="visible">True</property>
-                                <property name="margin_start">5</property>
+                                <property name="can_focus">False</property>
+                                <property name="margi_start">5</property>
                                 <property name="action_name">.uno:DataDataPilotRun</property>
                               </object>
                               <packing>
@@ -4915,6 +4992,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Insert-Insert">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Insert</property>
                                   </object>
                                   <packing>
@@ -4938,6 +5016,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Insert-InsertCell">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:InsertCell</property>
                                   </object>
                                   <packing>
@@ -5002,6 +5081,7 @@
                             <child>
                               <object class="GtkToolButton" id="Insert-InsertObjectChart">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:InsertObjectChart</property>
                               </object>
                               <packing>
@@ -5044,6 +5124,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Insert-FunctionBox">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:FunctionBox</property>
                                   </object>
                                   <packing>
@@ -5067,6 +5148,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Insert-InsertObject1">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:InsertObject</property>
                                   </object>
                                   <packing>
@@ -5131,6 +5213,7 @@
                             <child>
                               <object class="GtkToolButton" id="Insert-InsertGraphic">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:InsertGraphic</property>
                               </object>
                               <packing>
@@ -5173,6 +5256,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Insert-Gallery">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Gallery</property>
                                   </object>
                                   <packing>
@@ -5196,6 +5280,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Insert-InsertAVMedia">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:InsertAVMedia</property>
                                   </object>
                                   <packing>
@@ -5260,6 +5345,7 @@
                             <child>
                               <object class="GtkToolButton" id="Insert-HyperlinkDialog">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:HyperlinkDialog</property>
                               </object>
                               <packing>
@@ -5302,6 +5388,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Insert-AddName">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:AddName</property>
                                   </object>
                                   <packing>
@@ -5325,6 +5412,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Insert-DefineName">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:DefineName</property>
                                   </object>
                                   <packing>
@@ -5435,6 +5523,7 @@
                             <child>
                               <object class="GtkToolButton" id="Insert-DrawText">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:DrawText</property>
                               </object>
                               <packing>
@@ -5445,6 +5534,7 @@
                             <child>
                               <object class="GtkToolButton" id="Insert-VerticalText">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:VerticalText</property>
                               </object>
                               <packing>
@@ -5487,6 +5577,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Insert-Line1">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Line</property>
                                   </object>
                                   <packing>
@@ -5497,6 +5588,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Insert-Polygon_Unfilled1">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Polygon_Unfilled</property>
                                   </object>
                                   <packing>
@@ -5507,6 +5599,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Insert-Bezier_Unfilled1">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Bezier_Unfilled</property>
                                   </object>
                                   <packing>
@@ -5517,6 +5610,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Insert-ArrowsToolbox1">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ArrowsToolbox</property>
                                   </object>
                                   <packing>
@@ -5540,6 +5634,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Insert-BasicShapes.rectangle1">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:BasicShapes.rectangle</property>
                                   </object>
                                   <packing>
@@ -5550,6 +5645,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Insert-BasicShapes.ellipse1">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:BasicShapes.ellipse</property>
                                   </object>
                                   <packing>
@@ -5560,6 +5656,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Insert-DrawCaption1">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:DrawCaption</property>
                                   </object>
                                   <packing>
@@ -5570,6 +5667,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Insert-LineToolbox1">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:LineToolbox</property>
                                   </object>
                                   <packing>
@@ -5635,6 +5733,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Insert-BasicShapes">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:BasicShapes</property>
                                   </object>
                                   <packing>
@@ -5645,6 +5744,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Inser-SymbolShapes">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:SymbolShapes</property>
                                   </object>
                                   <packing>
@@ -5655,6 +5755,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Inser-ArrowShapes">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ArrowShapes</property>
                                   </object>
                                   <packing>
@@ -5676,6 +5777,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Inser-StarShapes">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:StarShapes</property>
                                   </object>
                                   <packing>
@@ -5686,6 +5788,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Inser-CalloutShapes">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:CalloutShapes</property>
                                   </object>
                                   <packing>
@@ -5696,6 +5799,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Insert-FlowChartShapes">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:FlowChartShapes</property>
                                   </object>
                                   <packing>
@@ -5760,6 +5864,7 @@
                             <child>
                               <object class="GtkToolButton" id="Insert-InsertSymbol">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:CharmapControl</property>
                               </object>
                               <packing>
@@ -5802,6 +5907,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Insert-InsertObjectStarMath">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:InsertObjectStarMath</property>
                                   </object>
                                   <packing>
@@ -5885,6 +5991,7 @@
                             <child>
                               <object class="GtkToolButton" id="Insert-DataDataPilotRun1">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:DataDataPilotRun</property>
                               </object>
                               <packing>
@@ -5895,6 +6002,7 @@
                             <child>
                               <object class="GtkToolButton" id="Insert-InsertDraw">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="valign">center</property>
                                 <property name="action_name">.uno:InsertDraw</property>
                               </object>
@@ -5906,6 +6014,7 @@
                             <child>
                               <object class="GtkToolButton" id="Insert-FunctionBox1">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:FunctionBox</property>
                               </object>
                               <packing>
@@ -5999,6 +6108,7 @@
                             <child>
                               <object class="GtkToolButton" id="PageFormatDialog">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:PageFormatDialog</property>
                               </object>
                               <packing>
@@ -6038,6 +6148,7 @@
                             <child>
                               <object class="GtkToolButton" id="Layout-EditHeaderAndFooter">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:EditHeaderAndFooter</property>
                               </object>
                               <packing>
@@ -6080,6 +6191,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Layout-NormalViewMode">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="halign">start</property>
                                     <property name="action_name">.uno:NormalViewMode</property>
                                   </object>
@@ -6104,6 +6216,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Layout-PagebreakMode">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:PagebreakMode</property>
                                   </object>
                                   <packing>
@@ -6168,6 +6281,7 @@
                             <child>
                               <object class="GtkToolButton" id="Layout-DefinePrintArea">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="valign">center</property>
                                 <property name="vexpand">True</property>
                                 <property name="action_name">.uno:DefinePrintArea</property>
@@ -6215,6 +6329,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Layout-EditPrintArea">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="valign">center</property>
                                     <property name="vexpand">True</property>
                                     <property name="action_name">.uno:EditPrintArea</property>
@@ -6242,6 +6357,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Layout-AddPrintArea">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="valign">center</property>
                                     <property name="vexpand">True</property>
                                     <property name="action_name">.uno:AddPrintArea</property>
@@ -6254,6 +6370,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Layout-DeletePrintArea">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="valign">center</property>
                                     <property name="vexpand">True</property>
                                     <property name="action_name">.uno:DeletePrintArea</property>
@@ -6320,6 +6437,7 @@
                             <child>
                               <object class="GtkToolButton" id="Layout-Insert">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:Insert</property>
                               </object>
                               <packing>
@@ -6362,7 +6480,8 @@
                                 <child>
                                   <object class="GtkMenuToolButton" id="Layout-RowOperations">
                                     <property name="visible">True</property>
-                                    <property name="tooltip_text" translatable="yes" context="CalcNotebookbar|objectalign|tooltip_text">Object Align</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="toolti_text" translatable="yes" context="CalcNotebookbar|objectalign|tooltip_text">Object Align</property>
                                     <property name="halign">start</property>
                                     <property name="action_name">.uno:RowOperations</property>
                                   </object>
@@ -6387,7 +6506,8 @@
                                 <child>
                                   <object class="GtkMenuToolButton" id="Layout-ColumnOperations">
                                     <property name="visible">True</property>
-                                    <property name="tooltip_text" translatable="yes" context="CalcNotebookbar|objectalign|tooltip_text">Object Align</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="toolti_text" translatable="yes" context="CalcNotebookbar|objectalign|tooltip_text">Object Align</property>
                                     <property name="halign">start</property>
                                     <property name="action_name">.uno:ColumnOperations</property>
                                   </object>
@@ -6450,6 +6570,7 @@
                             <child>
                               <object class="GtkToolButton" id="Layout-RenameTable">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:RenameTable</property>
                               </object>
                               <packing>
@@ -6495,6 +6616,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Layout-Show">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Show</property>
                                   </object>
                                   <packing>
@@ -6518,6 +6640,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Layout-Hide">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Hide</property>
                                   </object>
                                   <packing>
@@ -6582,6 +6705,7 @@
                             <child>
                               <object class="GtkToolButton" id="Layout-AutoFormat">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:AutoFormat</property>
                               </object>
                               <packing>
@@ -6627,6 +6751,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Layout-ChooseDesign">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ChooseDesign</property>
                                   </object>
                                   <packing>
@@ -6650,6 +6775,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Layout-TableEvents">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:TableEvents</property>
                                   </object>
                                   <packing>
@@ -6717,6 +6843,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Layout-SelectObject">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:SelectObject</property>
                                   </object>
                                   <packing>
@@ -6740,6 +6867,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Layout-FormatGroup">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:FormatGroup</property>
                                   </object>
                                   <packing>
@@ -6792,6 +6920,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Layout-ToggleObjectRotateMode">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ToggleObjectRotateMode</property>
                                   </object>
                                   <packing>
@@ -6815,7 +6944,8 @@
                                 <child>
                                   <object class="GtkMenuToolButton" id="Layout-ObjectAlign">
                                     <property name="visible">True</property>
-                                    <property name="tooltip_text" translatable="yes" context="CalcNotebookbar|objectalign|tooltip_text">Object Align</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="toolti_text" translatable="yes" context="CalcNotebookbar|objectalign|tooltip_text">Object Align</property>
                                     <property name="halign">start</property>
                                     <property name="action_name">.uno:ObjectAlign</property>
                                   </object>
@@ -6884,6 +7014,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Layout-BringToFront">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:BringToFront</property>
                                   </object>
                                   <packing>
@@ -6907,6 +7038,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Layout-SendToBack">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:SendToBack</property>
                                   </object>
                                   <packing>
@@ -6959,6 +7091,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Layout-ObjectForwardOne">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ObjectForwardOne</property>
                                   </object>
                                   <packing>
@@ -6982,6 +7115,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Layout-ObjectBackOne">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ObjectBackOne</property>
                                   </object>
                                   <packing>
@@ -7065,6 +7199,7 @@
                             <child>
                               <object class="GtkToolButton" id="Layout-PageFormatDialog">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:PageFormatDialog</property>
                               </object>
                               <packing>
@@ -7157,6 +7292,7 @@
                             <child>
                               <object class="GtkToolButton" id="Data-InsertExternalDataSource">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:InsertExternalDataSource</property>
                               </object>
                               <packing>
@@ -7196,6 +7332,7 @@
                             <child>
                               <object class="GtkToolButton" id="Data-DataStreams1">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:DataStreams</property>
                               </object>
                               <packing>
@@ -7235,6 +7372,7 @@
                             <child>
                               <object class="GtkToolButton" id="Data-ManageXMLSource">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:ManageXMLSource</property>
                               </object>
                               <packing>
@@ -7280,6 +7418,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Data-DataProvider">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:DataProvider</property>
                                   </object>
                                   <packing>
@@ -7305,6 +7444,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Data-DataProviderRefresh">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:DataProviderRefresh</property>
                                   </object>
                                   <packing>
@@ -7369,6 +7509,7 @@
                             <child>
                               <object class="GtkToolButton" id="Data-Calculate">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:Calculate</property>
                               </object>
                               <packing>
@@ -7423,6 +7564,7 @@
                             <child>
                               <object class="GtkToolButton" id="Data-PivotTable">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:DataDataPilotRun</property>
                               </object>
                               <packing>
@@ -7455,6 +7597,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Data-RecalcPivotTable">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:RecalcPivotTable</property>
                                   </object>
                                   <packing>
@@ -7480,6 +7623,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Data-DeletePivotTable">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:DeletePivotTable</property>
                                   </object>
                                   <packing>
@@ -7541,6 +7685,7 @@
                             <child>
                               <object class="GtkToolButton" id="Data-DataSort">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:DataSort</property>
                               </object>
                               <packing>
@@ -7586,6 +7731,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Data-SortAscending">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:SortAscending</property>
                                   </object>
                                   <packing>
@@ -7611,6 +7757,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Data-SortDescending">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:SortDescending</property>
                                   </object>
                                   <packing>
@@ -7681,6 +7828,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Data-DataFilterAutoFilter">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:DataFilterAutoFilter</property>
                                   </object>
                                   <packing>
@@ -7706,6 +7854,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Data-DataFilterSpecialFilter">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:DataFilterSpecialFilter</property>
                                   </object>
                                   <packing>
@@ -7758,6 +7907,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Data-DataFilterStandardFilter">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:DataFilterStandardFilter</property>
                                   </object>
                                   <packing>
@@ -7783,6 +7933,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Data-DataFilterHideAutoFilter">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:DataFilterHideAutoFilter</property>
                                   </object>
                                   <packing>
@@ -7847,6 +7998,7 @@
                             <child>
                               <object class="GtkToolButton" id="Data-DataSubTotals">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:DataSubTotals</property>
                               </object>
                               <packing>
@@ -7892,6 +8044,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Data-Group">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Group</property>
                                   </object>
                                   <packing>
@@ -7917,6 +8070,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Data-Ungroup">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Ungroup</property>
                                   </object>
                                   <packing>
@@ -7972,6 +8126,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Data-HideDetail">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:HideDetail</property>
                                   </object>
                                   <packing>
@@ -7997,6 +8152,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Data-ShowDetail">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ShowDetail</property>
                                   </object>
                                   <packing>
@@ -8061,6 +8217,7 @@
                             <child>
                               <object class="GtkToolButton" id="Data-DefineDBName">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:DefineDBName</property>
                               </object>
                               <packing>
@@ -8106,6 +8263,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Data-SelectDB">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:SelectDB</property>
                                   </object>
                                   <packing>
@@ -8131,6 +8289,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Data-DataAreaRefresh">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:DataAreaRefresh</property>
                                   </object>
                                   <packing>
@@ -8186,6 +8345,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Data-AddName">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:AddName</property>
                                   </object>
                                   <packing>
@@ -8211,6 +8371,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Data-DefineName">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:DefineName</property>
                                   </object>
                                   <packing>
@@ -8275,6 +8436,7 @@
                             <child>
                               <object class="GtkToolButton" id="Data-TextToColumns">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:TextToColumns</property>
                               </object>
                               <packing>
@@ -8320,6 +8482,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Data-DataConsolidate">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:DataConsolidate</property>
                                   </object>
                                   <packing>
@@ -8345,6 +8508,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Data-Validation">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Validation</property>
                                   </object>
                                   <packing>
@@ -8477,6 +8641,7 @@
                             <child>
                               <object class="GtkToolButton" id="Data-SearchDialog">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:SearchDialog</property>
                               </object>
                               <packing>
@@ -8487,6 +8652,7 @@
                             <child>
                               <object class="GtkToolButton" id="SortAscending">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="valign">center</property>
                                 <property name="action_name">.uno:SortAscending</property>
                               </object>
@@ -8498,6 +8664,7 @@
                             <child>
                               <object class="GtkToolButton" id="DataFilterAutoFilter">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="valign">center</property>
                                 <property name="action_name">.uno:DataFilterAutoFilter</property>
                               </object>
@@ -8590,6 +8757,7 @@
                             <child>
                               <object class="GtkToolButton" id="Review-SpellDialog">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:SpellDialog</property>
                               </object>
                               <packing>
@@ -8600,6 +8768,7 @@
                             <child>
                               <object class="GtkToolButton" id="Review-ThesaurusDialog">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:ThesaurusDialog</property>
                               </object>
                               <packing>
@@ -8643,6 +8812,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Review-SpellOnline">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:SpellOnline</property>
                                   </object>
                                   <packing>
@@ -8666,6 +8836,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Review-Hyphenate">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Hyphenate</property>
                                   </object>
                                   <packing>
@@ -8730,6 +8901,7 @@
                             <child>
                               <object class="GtkToolButton" id="Review-InsertAnnotation">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:InsertAnnotation</property>
                               </object>
                               <packing>
@@ -8740,6 +8912,7 @@
                             <child>
                               <object class="GtkToolButton" id="Review-EditAnnotation">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:EditAnnotation</property>
                               </object>
                               <packing>
@@ -8785,6 +8958,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Review-ShowAllNotes">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ShowAllNotes</property>
                                   </object>
                                   <packing>
@@ -8810,6 +8984,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Review-HideAllNotes">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:HideAllNotes</property>
                                   </object>
                                   <packing>
@@ -8865,6 +9040,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Review-DeleteAllNotes">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:DeleteAllNotes</property>
                                   </object>
                                   <packing>
@@ -8890,6 +9066,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Review-DeleteNote">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:DeleteNote</property>
                                   </object>
                                   <packing>
@@ -8954,6 +9131,7 @@
                             <child>
                               <object class="GtkToolButton" id="Review-TraceChangeMode">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:TraceChangeMode</property>
                               </object>
                               <packing>
@@ -8993,6 +9171,7 @@
                             <child>
                               <object class="GtkToolButton" id="Review-AcceptChanges">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:AcceptChanges</property>
                               </object>
                               <packing>
@@ -9047,6 +9226,7 @@
                             <child>
                               <object class="GtkToolButton" id="Review-Protect">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:Protect</property>
                               </object>
                               <packing>
@@ -9090,6 +9270,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Review-ToolProtectionDocument">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ToolProtectionDocument</property>
                                   </object>
                                   <packing>
@@ -9113,6 +9294,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Review-ShareDocument">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ShareDocument</property>
                                   </object>
                                   <packing>
@@ -9166,6 +9348,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Review-CompareDocuments">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:CompareDocuments</property>
                                   </object>
                                   <packing>
@@ -9189,6 +9372,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Review-MergeDocuments">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:MergeDocuments</property>
                                   </object>
                                   <packing>
@@ -9253,6 +9437,7 @@
                             <child>
                               <object class="GtkToolButton" id="Review-RedactDoc">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:RedactDoc</property>
                               </object>
                               <packing>
@@ -9310,6 +9495,7 @@
                             <child>
                               <object class="GtkToolButton" id="Review-EditDoc">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:EditDoc</property>
                               </object>
                               <packing>
@@ -9386,6 +9572,7 @@
                             <child>
                               <object class="GtkToolButton" id="AcceptChanges">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="valign">center</property>
                                 <property name="action_name">.uno:AcceptChanges</property>
                               </object>
@@ -9478,6 +9665,7 @@
                             <child>
                               <object class="GtkToolButton" id="View-NormalViewMode">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:NormalViewMode</property>
                               </object>
                               <packing>
@@ -9517,6 +9705,7 @@
                             <child>
                               <object class="GtkToolButton" id="View-PagebreakMode">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:PagebreakMode</property>
                               </object>
                               <packing>
@@ -9556,6 +9745,7 @@
                             <child>
                               <object class="GtkToolButton" id="View-PrintPreview">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:PrintPreview</property>
                               </object>
                               <packing>
@@ -9602,6 +9792,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="View-ViewValueHighlighting">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ViewValueHighlighting</property>
                                   </object>
                                   <packing>
@@ -9625,6 +9816,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="View-ToggleFormula">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ToggleFormula</property>
                                   </object>
                                   <packing>
@@ -9689,6 +9881,7 @@
                             <child>
                               <object class="GtkToolButton" id="View-ZoomOptimal">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:ZoomOptimal</property>
                               </object>
                               <packing>
@@ -9732,6 +9925,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="View-Zoom100Percent">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Zoom100Percent</property>
                                   </object>
                                   <packing>
@@ -9755,6 +9949,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="View-ZoomPage">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ZoomPage</property>
                                   </object>
                                   <packing>
@@ -9808,6 +10003,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="View-FullScreen">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:FullScreen</property>
                                   </object>
                                   <packing>
@@ -9831,6 +10027,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="View-ZoomPageWidth">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ZoomPageWidth</property>
                                   </object>
                                   <packing>
@@ -9895,6 +10092,7 @@
                             <child>
                               <object class="GtkToolButton" id="View-FreezePanes">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:FreezePanes</property>
                               </object>
                               <packing>
@@ -9923,105 +10121,30 @@
                         <property name="valign">center</property>
                         <property name="vexpand">True</property>
                         <child>
-                          <object class="GtkBox" id="GroupB36">
+                          <object class="sfxlo-NotebookbarToolBox" id="belowspacing2">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
-                            <property name="orientation">vertical</property>
+                            <property name="toolbar_style">both</property>
+                            <property name="show_arrow">False</property>
+                            <property name="icon_size">3</property>
                             <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="belowspacing3">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="View-SplitWindow">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:SplitWindow</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkBox" id="GroupB35">
+                              <object class="GtkToolButton" id="View-SplitWindow1">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="belowspacing2">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="valign">center</property>
-                                    <property name="vexpand">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="View-FreezePanesColumn">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:FreezePanesColumn</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">True</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin4">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="valign">center</property>
-                                    <property name="vexpand">True</property>
-                                    <property name="toolbar_style">both-horiz</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="View-FreezePanesRow">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:FreezePanesRow</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">True</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
+                                <property name="action_name">.uno:SplitWindow</property>
                               </object>
                               <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
+                                <property name="expand">True</property>
+                                <property name="homogeneous">True</property>
                               </packing>
                             </child>
                           </object>
                           <packing>
                             <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <style>
@@ -10067,6 +10190,7 @@
                             <child>
                               <object class="GtkToolButton" id="View-Sidebar">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:Sidebar</property>
                               </object>
                               <packing>
@@ -10112,6 +10236,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="View-ViewRowColumnHeaders">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ViewRowColumnHeaders</property>
                                   </object>
                                   <packing>
@@ -10137,6 +10262,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="View-ToggleSheetGrid">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ToggleSheetGrid</property>
                                   </object>
                                   <packing>
@@ -10192,6 +10318,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="View-Menubar">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Menubar</property>
                                   </object>
                                   <packing>
@@ -10217,6 +10344,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="View-InputLineVisible">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:InputLineVisible</property>
                                   </object>
                                   <packing>
@@ -10281,6 +10409,7 @@
                             <child>
                               <object class="GtkToolButton" id="View-NewWindow">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:NewWindow</property>
                               </object>
                               <packing>
@@ -10357,6 +10486,7 @@
                             <child>
                               <object class="GtkToolButton" id="View-Zoom">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="valign">center</property>
                                 <property name="action_name">.uno:Zoom</property>
                               </object>
@@ -10449,6 +10579,7 @@
                             <child>
                               <object class="GtkToolButton" id="Image-AssignMacro">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="valign">center</property>
                                 <property name="vexpand">True</property>
                                 <property name="action_name">.uno:AssignMacro</property>
@@ -10498,6 +10629,7 @@
                                     <child>
                                       <object class="GtkToolButton" id="Image-CompressGraphic">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="action_name">.uno:CompressGraphic</property>
                                       </object>
                                       <packing>
@@ -10521,6 +10653,7 @@
                                     <child>
                                       <object class="GtkToolButton" id="Image-Crop">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="action_name">.uno:Crop</property>
                                       </object>
                                       <packing>
@@ -10551,6 +10684,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Image-ToggleObjectRotateMode">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="valign">center</property>
                                     <property name="vexpand">True</property>
                                     <property name="action_name">.uno:ToggleObjectRotateMode</property>
@@ -10563,6 +10697,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Image-FlipVertical">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:FlipVertical</property>
                                   </object>
                                   <packing>
@@ -10573,6 +10708,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Image-FlipHorizontal">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:FlipHorizontal</property>
                                   </object>
                                   <packing>
@@ -10636,6 +10772,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Draw-FormatLine1">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:FormatLine</property>
                                   </object>
                                   <packing>
@@ -10659,6 +10796,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Draw-FormatArea1">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:FormatArea</property>
                                   </object>
                                   <packing>
@@ -10712,6 +10850,7 @@
                                       <object class="GtkMenuToolButton" id="Draw-XLineStyle1">
                                         <property name="width_request">100</property>
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="valign">center</property>
                                         <property name="action_name">.uno:XLineStyle</property>
                                       </object>
@@ -10723,6 +10862,7 @@
                                     <child>
                                       <object class="GtkToolButton" id="Draw-LineWidth1">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="action_name">.uno:LineWidth</property>
                                       </object>
                                       <packing>
@@ -10745,6 +10885,7 @@
                                     <property name="show_arrow">False</property>
                                     <child>
                                       <object class="GtkToolButton" id="Draw-LineEndStyle4">
+                                        <property name="can_focus">False</property>
                                         <property name="action_name">.uno:LineEndStyle</property>
                                       </object>
                                       <packing>
@@ -10755,6 +10896,7 @@
                                     <child>
                                       <object class="GtkToolButton" id="Draw-XLineColor1">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="action_name">.uno:XLineColor</property>
                                       </object>
                                       <packing>
@@ -10786,6 +10928,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Draw-FillStyle4">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:FillStyle</property>
                                   </object>
                                   <packing>
@@ -10834,6 +10977,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Draw-LineEndStyle1">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:LineEndStyle</property>
                                   </object>
                                   <packing>
@@ -10857,6 +11001,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Draw-FillShadow1">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:FillShadow</property>
                                   </object>
                                   <packing>
@@ -10921,6 +11066,7 @@
                             <child>
                               <object class="GtkMenuToolButton" id="Image-AnchorMenu">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="valign">center</property>
                                 <property name="vexpand">True</property>
                                 <property name="action_name">.uno:AnchorMenu</property>
@@ -10971,6 +11117,7 @@
                                     <child>
                                       <object class="GtkToolButton" id="Image-ObjectAlignLeft">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="action_name">.uno:ObjectAlignLeft</property>
                                       </object>
                                       <packing>
@@ -10981,6 +11128,7 @@
                                     <child>
                                       <object class="GtkToolButton" id="Image-AlignCenter">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="action_name">.uno:AlignCenter</property>
                                       </object>
                                       <packing>
@@ -10991,6 +11139,7 @@
                                     <child>
                                       <object class="GtkToolButton" id="Image-ObjectAlignRight">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="action_name">.uno:ObjectAlignRight</property>
                                       </object>
                                       <packing>
@@ -11014,6 +11163,7 @@
                                     <child>
                                       <object class="GtkToolButton" id="Image-AlignUp">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="action_name">.uno:AlignUp</property>
                                       </object>
                                       <packing>
@@ -11024,6 +11174,7 @@
                                     <child>
                                       <object class="GtkToolButton" id="Image-AlignMiddle">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="action_name">.uno:AlignMiddle</property>
                                       </object>
                                       <packing>
@@ -11034,6 +11185,7 @@
                                     <child>
                                       <object class="GtkToolButton" id="Image-AlignDown">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="action_name">.uno:AlignDown</property>
                                       </object>
                                       <packing>
@@ -11077,7 +11229,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="valign">center</property>
-                        <property name="margin_start">5</property>
+                        <property name="margi_start">5</property>
                         <property name="vexpand">True</property>
                         <child>
                           <object class="GtkSeparator" id="separator123">
@@ -11095,6 +11247,7 @@
                           </packing>
                         </child>
                         <child>
+                          <!-- n-columns=3 n-rows=3 -->
                           <object class="GtkGrid" id="grid1">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
@@ -11107,6 +11260,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Image-BringToFront">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:BringToFront</property>
                                   </object>
                                   <packing>
@@ -11129,6 +11283,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Image-SendToBack">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:SendToBack</property>
                                   </object>
                                   <packing>
@@ -11151,6 +11306,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Image-ObjectForwardOne">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ObjectForwardOne</property>
                                   </object>
                                   <packing>
@@ -11173,6 +11329,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Image-ObjectBackOne">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ObjectBackOne</property>
                                   </object>
                                   <packing>
@@ -11233,6 +11390,7 @@
                             <child>
                               <object class="GtkMenuToolButton" id="Image-GraphicFilterToolbox">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:GraphicFilterToolbox</property>
                               </object>
                               <packing>
@@ -11275,6 +11433,7 @@
                                 <child>
                                   <object class="GtkMenuToolButton" id="Image-GrafLuminance">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="valign">center</property>
                                     <property name="action_name">.uno:GrafLuminance</property>
                                   </object>
@@ -11299,6 +11458,7 @@
                                 <child>
                                   <object class="GtkMenuToolButton" id="Image-GrafContrast">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="valign">center</property>
                                     <property name="margin_end">5</property>
                                     <property name="action_name">.uno:GrafContrast</property>
@@ -11354,6 +11514,7 @@
                                 <child>
                                   <object class="GtkMenuToolButton" id="Image-GrafTransparence">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="valign">center</property>
                                     <property name="action_name">.uno:GrafTransparence</property>
                                   </object>
@@ -11378,6 +11539,7 @@
                                 <child>
                                   <object class="GtkMenuToolButton" id="Image-GrafGamma">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="valign">center</property>
                                     <property name="margin_end">5</property>
                                     <property name="action_name">.uno:GrafGamma</property>
@@ -11445,6 +11607,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Graphic-GrafMode">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:GrafMode</property>
                                   </object>
                                   <packing>
@@ -11468,6 +11631,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Graphic-ColorSettings">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ColorSettings</property>
                                   </object>
                                   <packing>
@@ -11550,6 +11714,7 @@
                             <child>
                               <object class="GtkToolButton" id="Image-SaveGraphic">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="valign">center</property>
                                 <property name="vexpand">True</property>
                                 <property name="action_name">.uno:SaveGraphic</property>
@@ -11562,6 +11727,7 @@
                             <child>
                               <object class="GtkToolButton" id="Image-FormatArea">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="valign">center</property>
                                 <property name="vexpand">True</property>
                                 <property name="action_name">.uno:FormatArea</property>
@@ -11574,6 +11740,7 @@
                             <child>
                               <object class="GtkToolButton" id="Image-FormatLine">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="valign">center</property>
                                 <property name="vexpand">True</property>
                                 <property name="action_name">.uno:FormatLine</property>
@@ -11586,6 +11753,7 @@
                             <child>
                               <object class="GtkToolButton" id="Image-TransformDialog">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="valign">center</property>
                                 <property name="vexpand">True</property>
                                 <property name="action_name">.uno:TransformDialog</property>
@@ -11682,6 +11850,7 @@
                             <child>
                               <object class="GtkToolButton" id="Draw-AssignMacro">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="valign">center</property>
                                 <property name="vexpand">True</property>
                                 <property name="action_name">.uno:AssignMacro</property>
@@ -11715,6 +11884,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Draw-ToggleObjectBezierMode1">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ToggleObjectBezierMode</property>
                                   </object>
                                   <packing>
@@ -11740,6 +11910,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Draw-ToggleObjectRotateMode">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ToggleObjectRotateMode</property>
                                   </object>
                                   <packing>
@@ -11750,6 +11921,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Draw-FlipVertical">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:FlipVertical</property>
                                   </object>
                                   <packing>
@@ -11760,6 +11932,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Draw-FlipHorizontal">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:FlipHorizontal</property>
                                   </object>
                                   <packing>
@@ -11823,6 +11996,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Draw-FormatLine2">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:FormatLine</property>
                                   </object>
                                   <packing>
@@ -11846,6 +12020,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Draw-FormatArea2">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:FormatArea</property>
                                   </object>
                                   <packing>
@@ -11899,6 +12074,7 @@
                                       <object class="GtkMenuToolButton" id="Draw-XLineStyle2">
                                         <property name="width_request">100</property>
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="valign">center</property>
                                         <property name="action_name">.uno:XLineStyle</property>
                                       </object>
@@ -11910,6 +12086,7 @@
                                     <child>
                                       <object class="GtkToolButton" id="Draw-LineWidth">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="action_name">.uno:LineWidth</property>
                                       </object>
                                       <packing>
@@ -11932,6 +12109,7 @@
                                     <property name="show_arrow">False</property>
                                     <child>
                                       <object class="GtkToolButton" id="Draw-LineEndStyle3">
+                                        <property name="can_focus">False</property>
                                         <property name="action_name">.uno:LineEndStyle</property>
                                       </object>
                                       <packing>
@@ -11942,6 +12120,7 @@
                                     <child>
                                       <object class="GtkToolButton" id="Draw-XLineColor">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="action_name">.uno:XLineColor</property>
                                       </object>
                                       <packing>
@@ -11973,6 +12152,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Draw-FillStyle2">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:FillStyle</property>
                                   </object>
                                   <packing>
@@ -12021,6 +12201,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Draw-LineEndStyle2">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:LineEndStyle</property>
                                   </object>
                                   <packing>
@@ -12044,6 +12225,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Draw-FillShadow">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:FillShadow</property>
                                   </object>
                                   <packing>
@@ -12108,6 +12290,7 @@
                             <child>
                               <object class="GtkMenuToolButton" id="Image-AnchorMenu1">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="valign">center</property>
                                 <property name="vexpand">True</property>
                                 <property name="action_name">.uno:AnchorMenu</property>
@@ -12158,6 +12341,7 @@
                                     <child>
                                       <object class="GtkToolButton" id="Image-ObjectAlignLeft1">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="action_name">.uno:ObjectAlignLeft</property>
                                       </object>
                                       <packing>
@@ -12168,6 +12352,7 @@
                                     <child>
                                       <object class="GtkToolButton" id="Image-AlignCenter1">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="action_name">.uno:AlignCenter</property>
                                       </object>
                                       <packing>
@@ -12178,6 +12363,7 @@
                                     <child>
                                       <object class="GtkToolButton" id="Image-ObjectAlignRight1">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="action_name">.uno:ObjectAlignRight</property>
                                       </object>
                                       <packing>
@@ -12201,6 +12387,7 @@
                                     <child>
                                       <object class="GtkToolButton" id="Image-AlignUp1">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="action_name">.uno:AlignUp</property>
                                       </object>
                                       <packing>
@@ -12211,6 +12398,7 @@
                                     <child>
                                       <object class="GtkToolButton" id="Image-AlignMiddle1">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="action_name">.uno:AlignMiddle</property>
                                       </object>
                                       <packing>
@@ -12221,6 +12409,7 @@
                                     <child>
                                       <object class="GtkToolButton" id="Image-AlignDown1">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="action_name">.uno:AlignDown</property>
                                       </object>
                                       <packing>
@@ -12281,6 +12470,7 @@
                           </packing>
                         </child>
                         <child>
+                          <!-- n-columns=3 n-rows=3 -->
                           <object class="GtkGrid" id="grid2">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
@@ -12293,6 +12483,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Draw-BringToFront">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:BringToFront</property>
                                   </object>
                                   <packing>
@@ -12315,6 +12506,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Draw-SendToBack">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:SendToBack</property>
                                   </object>
                                   <packing>
@@ -12337,6 +12529,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Draw-ObjectForwardOne">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ObjectForwardOne</property>
                                   </object>
                                   <packing>
@@ -12359,6 +12552,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Draw-ObjectBackOne">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ObjectBackOne</property>
                                   </object>
                                   <packing>
@@ -12422,6 +12616,7 @@
                             <child>
                               <object class="GtkToolButton" id="Draw-FormatGroup">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:FormatGroup</property>
                               </object>
                               <packing>
@@ -12469,6 +12664,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Draw-EnterGroup">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:EnterGroup</property>
                                   </object>
                                   <packing>
@@ -12494,6 +12690,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Draw-LeaveGroup">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:LeaveGroup</property>
                                   </object>
                                   <packing>
@@ -12561,6 +12758,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Draw-ExtrusionToggle">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ExtrusionToggle</property>
                                   </object>
                                   <packing>
@@ -12584,6 +12782,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Draw-ExtrusionDepthFloater">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ExtrusionDepthFloater</property>
                                   </object>
                                   <packing>
@@ -12594,6 +12793,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Draw-ExtrusionDirectionFloater">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ExtrusionDirectionFloater</property>
                                   </object>
                                   <packing>
@@ -12604,6 +12804,7 @@
                                 <child>
                                   <object class="GtkMenuToolButton" id="Draw-Extrusion3DColor">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Extrusion3DColor</property>
                                   </object>
                                   <packing>
@@ -12614,6 +12815,7 @@
                                 <child>
                                   <object class="GtkMenuToolButton" id="Draw-ExtrusionSurfaceFloater">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ExtrusionSurfaceFloater</property>
                                   </object>
                                   <packing>
@@ -12678,6 +12880,7 @@
                             <child>
                               <object class="GtkToolButton" id="Draw-FontworkGalleryFloater">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:FontworkGalleryFloater</property>
                               </object>
                               <packing>
@@ -12725,6 +12928,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Draw-FontworkShapeType">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:FontworkShapeType</property>
                                   </object>
                                   <packing>
@@ -12735,6 +12939,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Draw-FontworkSameLetterHeights">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:FontworkSameLetterHeights</property>
                                   </object>
                                   <packing>
@@ -12760,6 +12965,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Draw-FontworkAlignmentFloater">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:FontworkAlignmentFloater</property>
                                   </object>
                                   <packing>
@@ -12770,6 +12976,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Draw-FontworkCharacterSpacingFloater">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:FontworkCharacterSpacingFloater</property>
                                   </object>
                                   <packing>
@@ -12853,6 +13060,7 @@
                             <child>
                               <object class="GtkToolButton" id="Draw-FormatArea">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="valign">center</property>
                                 <property name="action_name">.uno:FormatArea</property>
                               </object>
@@ -12864,6 +13072,7 @@
                             <child>
                               <object class="GtkToolButton" id="Draw-FormatLine">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="valign">center</property>
                                 <property name="action_name">.uno:FormatLine</property>
                               </object>
@@ -12875,6 +13084,7 @@
                             <child>
                               <object class="GtkToolButton" id="Draw-TransformDialog">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="valign">center</property>
                                 <property name="action_name">.uno:TransformDialog</property>
                               </object>
@@ -12973,6 +13183,7 @@
                             <child>
                               <object class="GtkToolButton" id="Object-AssignMacro">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="valign">center</property>
                                 <property name="vexpand">True</property>
                                 <property name="action_name">.uno:AssignMacro</property>
@@ -13006,6 +13217,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Object-OriginalSize">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:OriginalSize</property>
                                   </object>
                                   <packing>
@@ -13031,6 +13243,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Object-ToggleObjectRotateMode">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ToggleObjectRotateMode</property>
                                   </object>
                                   <packing>
@@ -13041,6 +13254,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Object-FlipVertical">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:FlipVertical</property>
                                   </object>
                                   <packing>
@@ -13051,6 +13265,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Object-FlipHorizontal">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:FlipHorizontal</property>
                                   </object>
                                   <packing>
@@ -13114,6 +13329,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Draw-FormatLine3">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:FormatLine</property>
                                   </object>
                                   <packing>
@@ -13137,6 +13353,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Draw-FormatArea3">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:FormatArea</property>
                                   </object>
                                   <packing>
@@ -13190,6 +13407,7 @@
                                       <object class="GtkMenuToolButton" id="Object-XLineStyle5">
                                         <property name="width_request">100</property>
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="valign">center</property>
                                         <property name="action_name">.uno:XLineStyle</property>
                                       </object>
@@ -13201,6 +13419,7 @@
                                     <child>
                                       <object class="GtkToolButton" id="ObjectLineWidth2">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="action_name">.uno:LineWidth</property>
                                       </object>
                                       <packing>
@@ -13223,6 +13442,7 @@
                                     <property name="show_arrow">False</property>
                                     <child>
                                       <object class="GtkToolButton" id="Object-LineEndStyle5">
+                                        <property name="can_focus">False</property>
                                         <property name="action_name">.uno:LineEndStyle</property>
                                       </object>
                                       <packing>
@@ -13233,6 +13453,7 @@
                                     <child>
                                       <object class="GtkToolButton" id="Object-XLineColor4">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="action_name">.uno:XLineColor</property>
                                       </object>
                                       <packing>
@@ -13264,6 +13485,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Object-FillStyle1">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:FillStyle</property>
                                   </object>
                                   <packing>
@@ -13312,6 +13534,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Object-LineEndStyle1">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:LineEndStyle</property>
                                   </object>
                                   <packing>
@@ -13335,6 +13558,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Object-FillShadow1">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:FillShadow</property>
                                   </object>
                                   <packing>
@@ -13425,6 +13649,7 @@
                                     <child>
                                       <object class="GtkToolButton" id="Object-ObjectAlignLeft">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="action_name">.uno:ObjectAlignLeft</property>
                                       </object>
                                       <packing>
@@ -13435,6 +13660,7 @@
                                     <child>
                                       <object class="GtkToolButton" id="Object-AlignCenter">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="action_name">.uno:AlignCenter</property>
                                       </object>
                                       <packing>
@@ -13445,6 +13671,7 @@
                                     <child>
                                       <object class="GtkToolButton" id="Object-ObjectAlignRight">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="action_name">.uno:ObjectAlignRight</property>
                                       </object>
                                       <packing>
@@ -13468,6 +13695,7 @@
                                     <child>
                                       <object class="GtkToolButton" id="Object-AlignUp">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="action_name">.uno:AlignUp</property>
                                       </object>
                                       <packing>
@@ -13478,6 +13706,7 @@
                                     <child>
                                       <object class="GtkToolButton" id="Object-AlignDown">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="action_name">.uno:AlignDown</property>
                                       </object>
                                       <packing>
@@ -13488,6 +13717,7 @@
                                     <child>
                                       <object class="GtkToolButton" id="Object-AlignMiddle">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="action_name">.uno:AlignMiddle</property>
                                       </object>
                                       <packing>
@@ -13548,6 +13778,7 @@
                           </packing>
                         </child>
                         <child>
+                          <!-- n-columns=3 n-rows=3 -->
                           <object class="GtkGrid" id="grid3">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
@@ -13560,6 +13791,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Object-BringToFront">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:BringToFront</property>
                                   </object>
                                   <packing>
@@ -13582,6 +13814,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Object-SendToBack">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:SendToBack</property>
                                   </object>
                                   <packing>
@@ -13604,6 +13837,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Object-ObjectForwardOne">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ObjectForwardOne</property>
                                   </object>
                                   <packing>
@@ -13626,6 +13860,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Object-ObjectBackOne">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ObjectBackOne</property>
                                   </object>
                                   <packing>
@@ -13708,6 +13943,7 @@
                             <child>
                               <object class="GtkToolButton" id="Object-FormatArea">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="valign">center</property>
                                 <property name="action_name">.uno:FormatArea</property>
                               </object>
@@ -13719,6 +13955,7 @@
                             <child>
                               <object class="GtkToolButton" id="Object-FormatLine">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="valign">center</property>
                                 <property name="action_name">.uno:FormatLine</property>
                               </object>
@@ -13730,6 +13967,7 @@
                             <child>
                               <object class="GtkToolButton" id="Object-TransformDialog">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="valign">center</property>
                                 <property name="action_name">.uno:TransformDialog</property>
                               </object>
@@ -13826,6 +14064,7 @@
                             <child>
                               <object class="GtkToolButton" id="Media-AssignMacro">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="valign">center</property>
                                 <property name="vexpand">True</property>
                                 <property name="action_name">.uno:AssignMacro</property>
@@ -13857,6 +14096,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Media-AVMediaPlayer">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:AVMediaPlayer</property>
                                   </object>
                                   <packing>
@@ -13880,6 +14120,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Media-ToggleObjectRotateMode">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ToggleObjectRotateMode</property>
                                   </object>
                                   <packing>
@@ -13941,6 +14182,7 @@
                             <child>
                               <object class="GtkMenuToolButton" id="Object-Anchor2">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="valign">center</property>
                                 <property name="vexpand">True</property>
                                 <property name="action_name">.uno:AnchorMenu</property>
@@ -14006,6 +14248,7 @@
                                     <child>
                                       <object class="GtkToolButton" id="Object-ObjectAlignLeft2">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="action_name">.uno:ObjectAlignLeft</property>
                                       </object>
                                       <packing>
@@ -14016,6 +14259,7 @@
                                     <child>
                                       <object class="GtkToolButton" id="Object-AlignCenter2">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="action_name">.uno:AlignCenter</property>
                                       </object>
                                       <packing>
@@ -14026,6 +14270,7 @@
                                     <child>
                                       <object class="GtkToolButton" id="Object-ObjectAlignRight2">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="action_name">.uno:ObjectAlignRight</property>
                                       </object>
                                       <packing>
@@ -14049,6 +14294,7 @@
                                     <child>
                                       <object class="GtkToolButton" id="Object-AlignUp2">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="action_name">.uno:AlignUp</property>
                                       </object>
                                       <packing>
@@ -14059,6 +14305,7 @@
                                     <child>
                                       <object class="GtkToolButton" id="Object-AlignMiddle2">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="action_name">.uno:AlignMiddle</property>
                                       </object>
                                       <packing>
@@ -14069,6 +14316,7 @@
                                     <child>
                                       <object class="GtkToolButton" id="Object-AlignDown2">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="action_name">.uno:AlignDown</property>
                                       </object>
                                       <packing>
@@ -14129,6 +14377,7 @@
                           </packing>
                         </child>
                         <child>
+                          <!-- n-columns=3 n-rows=3 -->
                           <object class="GtkGrid" id="grid4">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
@@ -14141,6 +14390,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Object-BringToFront2">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:BringToFront</property>
                                   </object>
                                   <packing>
@@ -14163,6 +14413,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Object-SendToBack2">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:SendToBack</property>
                                   </object>
                                   <packing>
@@ -14185,6 +14436,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Object-ObjectForwardOne2">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ObjectForwardOne</property>
                                   </object>
                                   <packing>
@@ -14207,6 +14459,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Object-ObjectBackOne2">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ObjectBackOne</property>
                                   </object>
                                   <packing>
@@ -14271,6 +14524,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Media-AVMediaToolBox">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:AVMediaToolBox</property>
                                   </object>
                                   <packing>
@@ -14294,6 +14548,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Media-AVMediaPlayer1">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:AVMediaPlayer</property>
                                   </object>
                                   <packing>
@@ -14372,6 +14627,7 @@
                             <child>
                               <object class="GtkToolButton" id="Media-FormatArea">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="valign">center</property>
                                 <property name="action_name">.uno:FormatArea</property>
                               </object>
@@ -14383,6 +14639,7 @@
                             <child>
                               <object class="GtkToolButton" id="Media-FormatLine">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="valign">center</property>
                                 <property name="action_name">.uno:FormatLine</property>
                               </object>
@@ -14394,6 +14651,7 @@
                             <child>
                               <object class="GtkToolButton" id="Media-TransformDialog">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="valign">center</property>
                                 <property name="action_name">.uno:TransformDialog</property>
                               </object>
@@ -14489,6 +14747,7 @@
                             <child>
                               <object class="GtkToolButton" id="Print-PageFormatDialog">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:PageFormatDialog</property>
                               </object>
                               <packing>
@@ -14519,6 +14778,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Print-Margins">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Margins</property>
                                   </object>
                                   <packing>
@@ -14542,6 +14802,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Print-EditHeaderAndFooter">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:EditHeaderAndFooter</property>
                                   </object>
                                   <packing>
@@ -14610,6 +14871,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Print-FirstPage">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:FirstPage</property>
                                   </object>
                                   <packing>
@@ -14620,6 +14882,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Print-PreviousPage">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:PreviousPage</property>
                                   </object>
                                   <packing>
@@ -14630,6 +14893,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Print-NextPage">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:NextPage</property>
                                   </object>
                                   <packing>
@@ -14640,6 +14904,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Print-LastPage">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:LastPage</property>
                                   </object>
                                   <packing>
@@ -14669,6 +14934,7 @@
                                     <child>
                                       <object class="GtkToolButton" id="Print-ZoomOut">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="action_name">.uno:ZoomMinus</property>
                                       </object>
                                       <packing>
@@ -14692,6 +14958,7 @@
                                     <child>
                                       <object class="GtkToolButton" id="Print-ZoomIn">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="action_name">.uno:ZoomPlus</property>
                                       </object>
                                       <packing>
@@ -14761,6 +15028,7 @@
                             <child>
                               <object class="GtkToolButton" id="Print-Print">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:Print</property>
                               </object>
                               <packing>
@@ -14788,6 +15056,7 @@
                             <child>
                               <object class="GtkToolButton" id="Print-ClosePreview1">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:ClosePreview</property>
                               </object>
                               <packing>
@@ -14860,6 +15129,7 @@
                             <child>
                               <object class="GtkToolButton" id="Print-FullScreen">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:FullScreen</property>
                               </object>
                               <packing>
@@ -14954,6 +15224,7 @@
                             <child>
                               <object class="GtkToolButton" id="Form-SwitchControlDesignMode1">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:SwitchControlDesignMode</property>
                               </object>
                               <packing>
@@ -14999,6 +15270,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Form-UseWizards">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:UseWizards</property>
                                   </object>
                                   <packing>
@@ -15024,6 +15296,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Form-GroupBox">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:GroupBox</property>
                                   </object>
                                   <packing>
@@ -15092,6 +15365,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Form-FormProperties">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:FormProperties</property>
                                   </object>
                                   <packing>
@@ -15115,6 +15389,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Form-ShowFmExplorer">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ShowFmExplorer</property>
                                   </object>
                                   <packing>
@@ -15165,6 +15440,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Form-TabDialog1">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:TabDialog</property>
                                   </object>
                                   <packing>
@@ -15188,6 +15464,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Form-OpenReadOnly1">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:OpenReadOnly</property>
                                   </object>
                                   <packing>
@@ -15253,6 +15530,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Form-ControlProperties2">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ControlProperties</property>
                                   </object>
                                   <packing>
@@ -15276,6 +15554,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Form-AutoControlFocus2">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:AutoControlFocus</property>
                                   </object>
                                   <packing>
@@ -15344,6 +15623,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Tools-Label1">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Label</property>
                                   </object>
                                   <packing>
@@ -15354,6 +15634,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Tools-Edit1">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Edit</property>
                                   </object>
                                   <packing>
@@ -15364,6 +15645,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Tools-CheckBox1">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:CheckBox</property>
                                   </object>
                                   <packing>
@@ -15387,6 +15669,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Tools-RadioButton2">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:RadioButton</property>
                                   </object>
                                   <packing>
@@ -15397,6 +15680,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Tools-ListBox2">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ListBox</property>
                                   </object>
                                   <packing>
@@ -15407,6 +15691,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Tools-ComboBox2">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ComboBox</property>
                                   </object>
                                   <packing>
@@ -15475,6 +15760,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Tools-NumericField2">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:NumericField</property>
                                   </object>
                                   <packing>
@@ -15485,6 +15771,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Tools-CurrencyField2">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:CurrencyField</property>
                                   </object>
                                   <packing>
@@ -15495,6 +15782,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Tools-PatternField2">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:PatternField</property>
                                   </object>
                                   <packing>
@@ -15518,6 +15806,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Tools-FormattedField1">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:FormattedField</property>
                                   </object>
                                   <packing>
@@ -15528,6 +15817,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Tools-DateField1">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:DateField</property>
                                   </object>
                                   <packing>
@@ -15538,6 +15828,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Tools-TimeField1">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:TimeField</property>
                                   </object>
                                   <packing>
@@ -15606,6 +15897,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Form-Pushbutton">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Pushbutton</property>
                                   </object>
                                   <packing>
@@ -15616,6 +15908,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Form-Imagebutton">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Imagebutton</property>
                                   </object>
                                   <packing>
@@ -15626,6 +15919,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Form-ImageControl">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ImageControl</property>
                                   </object>
                                   <packing>
@@ -15649,6 +15943,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Form-FileControl">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:FileControl</property>
                                   </object>
                                   <packing>
@@ -15659,6 +15954,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Form-NavigationBar">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:NavigationBar</property>
                                   </object>
                                   <packing>
@@ -15669,6 +15965,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Form-Grid">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Grid</property>
                                   </object>
                                   <packing>
@@ -15752,6 +16049,7 @@
                             <child>
                               <object class="GtkToolButton" id="FormMenu-FormProperties">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:FormProperties</property>
                               </object>
                               <packing>
@@ -15974,6 +16272,7 @@
                             <child>
                               <object class="GtkToolButton" id="Tools-RunMacro">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:RunMacro</property>
                               </object>
                               <packing>
@@ -16017,6 +16316,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Tools-BasicIDEAppear">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:BasicIDEAppear</property>
                                   </object>
                                   <packing>
@@ -16040,6 +16340,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Tools-MacroDialog">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:MacroDialog</property>
                                   </object>
                                   <packing>
@@ -16104,6 +16405,7 @@
                             <child>
                               <object class="GtkToolButton" id="Tools-AuditingFillMode">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:AuditingFillMode</property>
                               </object>
                               <packing>
@@ -16147,6 +16449,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Tools-ShowPrecedents">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ShowPrecedents</property>
                                   </object>
                                   <packing>
@@ -16170,6 +16473,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Tools-ShowDependents">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ShowDependents</property>
                                   </object>
                                   <packing>
@@ -16220,6 +16524,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Tools-ClearArrowPrecedents">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ClearArrowPrecedents</property>
                                   </object>
                                   <packing>
@@ -16243,6 +16548,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Tools-ClearArrowDependents">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ClearArrowDependents</property>
                                   </object>
                                   <packing>
@@ -16307,6 +16613,7 @@
                             <child>
                               <object class="GtkToolButton" id="Tools-GoalSeekDialog">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:GoalSeekDialog</property>
                               </object>
                               <packing>
@@ -16346,6 +16653,7 @@
                             <child>
                               <object class="GtkToolButton" id="Tools-SolverDialog">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:SolverDialog</property>
                               </object>
                               <packing>
@@ -16392,6 +16700,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Tools-ShowErrors">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ShowErrors</property>
                                   </object>
                                   <packing>
@@ -16415,6 +16724,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Tools-ShowInvalid">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ShowInvalid</property>
                                   </object>
                                   <packing>
@@ -16479,6 +16789,7 @@
                             <child>
                               <object class="GtkToolButton" id="Tools-SwitchControlDesignMode">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:SwitchControlDesignMode</property>
                               </object>
                               <packing>
@@ -16524,6 +16835,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Tools-UseWizards1">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:UseWizards</property>
                                   </object>
                                   <packing>
@@ -16549,6 +16861,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Tools-GroupBox1">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:GroupBox</property>
                                   </object>
                                   <packing>
@@ -16617,6 +16930,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Tools-Label">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Label</property>
                                   </object>
                                   <packing>
@@ -16627,6 +16941,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Tools-Edit">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Edit</property>
                                   </object>
                                   <packing>
@@ -16637,6 +16952,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Tools-CheckBox">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:CheckBox</property>
                                   </object>
                                   <packing>
@@ -16660,6 +16976,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Tools-RadioButton1">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:RadioButton</property>
                                   </object>
                                   <packing>
@@ -16670,6 +16987,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Tools-ListBox1">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ListBox</property>
                                   </object>
                                   <packing>
@@ -16680,6 +16998,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Tools-ComboBox1">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ComboBox</property>
                                   </object>
                                   <packing>
@@ -16748,6 +17067,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Tools-NumericField1">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:NumericField</property>
                                   </object>
                                   <packing>
@@ -16758,6 +17078,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Tools-CurrencyField1">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:CurrencyField</property>
                                   </object>
                                   <packing>
@@ -16768,6 +17089,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Tools-PatternField1">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:PatternField</property>
                                   </object>
                                   <packing>
@@ -16791,6 +17113,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Tools-FormattedField">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:FormattedField</property>
                                   </object>
                                   <packing>
@@ -16801,6 +17124,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Tools-DateField">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:DateField</property>
                                   </object>
                                   <packing>
@@ -16811,6 +17135,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Tools-TimeField">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:TimeField</property>
                                   </object>
                                   <packing>
@@ -16879,6 +17204,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Tools-Pushbutton">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Pushbutton</property>
                                   </object>
                                   <packing>
@@ -16889,6 +17215,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Tools-Imagebutton">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Imagebutton</property>
                                   </object>
                                   <packing>
@@ -16899,6 +17226,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Tools-ImageControl">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ImageControl</property>
                                   </object>
                                   <packing>
@@ -16922,6 +17250,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Tools-FileControl">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:FileControl</property>
                                   </object>
                                   <packing>
@@ -16932,6 +17261,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Tools-NavigationBar">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:NavigationBar</property>
                                   </object>
                                   <packing>
@@ -16942,6 +17272,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Tools-Grid">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Grid</property>
                                   </object>
                                   <packing>
@@ -17010,6 +17341,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Tools-FormProperties">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:FormProperties</property>
                                   </object>
                                   <packing>
@@ -17020,6 +17352,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Tools-TabDialog">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:TabDialog</property>
                                   </object>
                                   <packing>
@@ -17030,6 +17363,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Tools-ControlProperties">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ControlProperties</property>
                                   </object>
                                   <packing>
@@ -17053,6 +17387,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Tools-ShowFmExplorer1">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ShowFmExplorer</property>
                                   </object>
                                   <packing>
@@ -17063,6 +17398,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Tools-OpenReadOnly">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:OpenReadOnly</property>
                                   </object>
                                   <packing>
@@ -17073,6 +17409,7 @@
                                 <child>
                                   <object class="GtkToolButton" id="Tools-AutoControlFocus">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="action_name">.uno:AutoControlFocus</property>
                                   </object>
                                   <packing>
@@ -17156,6 +17493,7 @@
                             <child>
                               <object class="GtkToolButton" id="Tools-ShowFmExplorer">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="action_name">.uno:OptionsTreeDialog</property>
                               </object>
                               <packing>
@@ -17235,7 +17573,7 @@
   </object>
   <object class="GtkSizeGroup" id="1stRow">
     <property name="mode">vertical</property>
-    <property name="ignore_hidden">True</property>
+    <property name="ignore-hidden">True</property>
     <widgets>
       <widget name="LineA7"/>
       <widget name="box76"/>
@@ -17248,7 +17586,7 @@
   </object>
   <object class="GtkSizeGroup" id="2ndRow">
     <property name="mode">vertical</property>
-    <property name="ignore_hidden">True</property>
+    <property name="ignore-hidden">True</property>
     <widgets>
       <widget name="LineB8"/>
       <widget name="GroupB11"/>