diff --git a/sd/uiconfig/simpress/ui/notebookbar.ui b/sd/uiconfig/simpress/ui/notebookbar.ui
index 7a2017aa4ef6..f997a19e15d3 100644
--- a/sd/uiconfig/simpress/ui/notebookbar.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar.ui
@@ -1,2377 +1,2382 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.40.0 -->
 <interface domain="sd">
   <requires lib="gtk+" version="3.24"/>
   <requires lib="LibreOffice" version="1.0"/>
   <!-- interface-local-resource-path ../../../icon-themes/colibre/cmd/ -->
-  <object class="GtkTreeStore" id="liststore1">
-    <columns>
-      <!-- column-name expander -->
-      <column type="GdkPixbuf"/>
-      <!-- column-name text -->
-      <column type="gchararray"/>
-      <!-- column-name id -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
   <object class="GtkMenu" id="Menu Addons">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <child>
       <object class="NotebookBarAddonsMenuMergePoint" id="AddonCommands-Menu">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">AddonCommand</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">AddonCommand</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="AddonSection-Separator">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="Menu-Extension-PackageManagerDialog">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ExtensionManager</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:ExtensionManager</property>
       </object>
     </child>
   </object>
   <object class="GtkMenu" id="Menu Convert">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <child>
       <object class="GtkMenuItem" id="MenuConvert-ChangeBezier">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ChangeBezier</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:ChangeBezier</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuConvert-ChangePolygon">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ChangePolygon</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:ChangePolygon</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuConvert-convert_to_contour">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:convert_to_contour</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:convert_to_contour</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuConvert-ConvertInto3">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ConvertInto3D</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:ConvertInto3D</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuConvert-ConvertInto3DLatheFast">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ConvertInto3DLatheFast</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:ConvertInto3DLatheFast</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuConvert-ConvertIntoBitmap">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ConvertIntoBitmap</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:ConvertIntoBitmap</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuConvert-ConvertIntoMetaFile">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ConvertIntoMetaFile</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:ConvertIntoMetaFile</property>
       </object>
     </child>
   </object>
   <object class="GtkMenu" id="Menu Draw">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <child>
       <object class="GtkMenuItem" id="MenuDraw-ToggleObjectBezierMode">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ToggleObjectBezierMode</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:ToggleObjectBezierMode</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuDraw-ToggleObjectRotateMode">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ToggleObjectRotateMode</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:ToggleObjectRotateMode</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuDraw-MirrorVert">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:MirrorVert</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:MirrorVert</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuDraw-MirrorHorz">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:MirrorHorz</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:MirrorHorz</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuDraw-AdvancedMode">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:AdvancedMode</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:AdvancedMode</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuDraw-separator1">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuDraw-Combine">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Combine</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:Combine</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuDraw-Dismantle">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Dismantle</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:Dismantle</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuDraw-Merge">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Merge</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:Merge</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuDraw-Substract">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Substract</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:Substract</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuDraw-Intersect">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Intersect</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:Intersect</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuDraw-EqualizeWidth">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:EqualizeWidth</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:EqualizeWidth</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuDraw-EqualizeHeight">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:EqualizeHeight</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:EqualizeHeight</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuDraw-Connect">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Connect</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:Connect</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuDraw-Break">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Break</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:Break</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuDraw-separator2">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuDraw-CopyObjects">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:CopyObjects</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:CopyObjects</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuDraw-Morphing">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Morphing</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:Morphing</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuDraw-separator3">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuDraw-ChangeBezier">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ChangeBezier</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:ChangeBezier</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuDraw-ChangePolygon">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ChangePolygon</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:ChangePolygon</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuDraw-convert_to_contour">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:convert_to_contour</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:convert_to_contour</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuDraw-ConvertInto3D">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ConvertInto3D</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:ConvertInto3D</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuDraw-ConvertInto3DLatheFast">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ConvertInto3DLatheFast</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:ConvertInto3DLatheFast</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuDraw-ConvertIntoBitmap">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ConvertIntoBitmap</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:ConvertIntoBitmap</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuDraw-ConvertIntoMetaFile">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ConvertIntoMetaFile</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:ConvertIntoMetaFile</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuDraw-separator4">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuDraw-NameGroup">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:NameGroup</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:NameGroup</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuDraw-ObjectTitleDescription">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ObjectTitleDescription</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:ObjectTitleDescription</property>
       </object>
     </child>
   </object>
   <object class="GtkMenu" id="Menu Field">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <child>
       <object class="GtkMenuItem" id="MenuField-InsertDateFieldFix">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertDateFieldFix</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:InsertDateFieldFix</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuField-InsertDateFieldVar">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertDateFieldVar</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:InsertDateFieldVar</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuField-InsertTimeFieldFix">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertTimeFieldFix</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:InsertTimeFieldFix</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuField-InsertTimeFieldVar">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertTimeFieldVar</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:InsertTimeFieldVar</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuField-separator1">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuField-InsertAuthorField">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertAuthorField</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:InsertAuthorField</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuField-InsertSlideField">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertSlideField</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:InsertSlideField</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuField-InsertSlideTitleField">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertSlideTitleField</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:InsertSlideTitleField</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuField-InsertSlidesField">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertSlidesField</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:InsertSlidesField</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuField-InsertFileField">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertFileField</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:InsertFileField</property>
       </object>
     </child>
   </object>
   <object class="GtkMenu" id="Menu File">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <child>
       <object class="GtkMenuItem" id="MenuFile-AddDirect">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:AddDirect</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:AddDirect</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuFile-RecentFileList">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:RecentFileList</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:RecentFileList</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuFile-CloseDoc">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:CloseDoc</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:CloseDoc</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuFile-separator">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuFile-Save">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Save</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:Save</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuFile-SaveAs">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SaveAs</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:SaveAs</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuFile-SaveAsRemote">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SaveAsRemote</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:SaveAsRemote</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuFile-SaveACopy">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SaveACopy</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:SaveACopy</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuFile-separator1">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuFile-Reload">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Reload</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:Reload</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuFile-separator2">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuFile-ExportTo">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ExportTo</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:ExportTo</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuFile-ExportToPDF">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ExportToPDF</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:ExportToPDF</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuFile-separator3">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuFile-SendMail">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SendMail</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:SendMail</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuFile-SendMailDocAsPDF">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SendMailDocAsPDF</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:SendMailDocAsPDF</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuFile-SendViaBluetooth">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SendViaBluetooth</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:SendViaBluetooth</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuFile-separator4">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuFile-WebHtml">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:WebHtml</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:WebHtml</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuFile-Print">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Print</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:Print</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuFile-PrintDefault">
-        <property name="visible">False</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:PrintDefault</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:PrintDefault</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuFile-PrinterSetup">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:PrinterSetup</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:PrinterSetup</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuFile-separator5">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuFile-Signature">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Signature</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:Signature</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuFile-SignPDF">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SignPDF</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:SignPDF</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuFile-SetDocumentProperties">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SetDocumentProperties</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:SetDocumentProperties</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator43">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuFile-Quit">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Quit</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:Quit</property>
       </object>
     </child>
   </object>
   <object class="GtkMenu" id="Menu Form">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <child>
       <object class="GtkMenuItem" id="MenuForm-Label">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Label</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:Label</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuForm-Edit">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Edit</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:Edit</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuForm-CheckBox">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:CheckBox</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:CheckBox</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuForm-RadioButton">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:RadioButton</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:RadioButton</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuForm-ListBox">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ListBox</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:ListBox</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuForm-ComboBox">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ComboBox</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:ComboBox</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuForm-separator2">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuForm-Pushbutton">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Pushbutton</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:Pushbutton</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuForm-Imagebutton">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Imagebutton</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:Imagebutton</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuForm-separator3">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuForm-FormattedField">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:FormattedField</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:FormattedField</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuForm-separator4">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuForm-DateField">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:DateField</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:DateField</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuForm-TimeField">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:TimeField</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:TimeField</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuForm-NumericField">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:NumericField</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:NumericField</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuForm-CurrencyField">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:CurrencyField</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:CurrencyField</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuForm-PatternField">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:PatternField</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:PatternField</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuForm-separator5">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuForm-ImageControl">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ImageControl</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:ImageControl</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuForm-FileControl">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:FileControl</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:FileControl</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuForm-separator7">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuForm-Grid">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Grid</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:Grid</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuForm-NavigationBar">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:NavigationBar</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:NavigationBar</property>
       </object>
     </child>
   </object>
   <object class="GtkMenu" id="Menu Help">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <child>
       <object class="GtkMenuItem" id="MenuHelp-HelpIndex">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:HelpIndex</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:HelpIndex</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuHelp-ExtendedHelp">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ExtendedHelp</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:ExtendedHelp</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuHelp-Documentation">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Documentation</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:Documentation</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuHelp-separator">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuHelp-QuestionAnswers">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:QuestionAnswers</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:QuestionAnswers</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuHelp-SendFeedback">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SendFeedback</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:SendFeedback</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuHelp-separator1">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuHelp-SafeMode">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SafeMode</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:SafeMode</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuHelp-GetInvolved">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:GetInvolved</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:GetInvolved</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuHelp-separator2">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuHelp-Donation">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Donation</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:Donation</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuHelp-separator3">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuHelp-ShowLicense">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ShowLicense</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:ShowLicense</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuHelp-separator4">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuHelp-About">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:About</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:About</property>
       </object>
     </child>
   </object>
   <object class="GtkMenu" id="Menu Home">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <child>
       <object class="GtkMenuItem" id="MenuHome-Shadowed">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Shadowed</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:Shadowed</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuHome-OutlineFont">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:OutlineFont</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:OutlineFont</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuHome-Overline">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Overline</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:Overline</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuHome-separator1">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuHome-ChangeCaseToUpper">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ChangeCaseToUpper</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:ChangeCaseToUpper</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuHome-ChangeCaseToLower">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ChangeCaseToLower</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:ChangeCaseToLower</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuHome-ChangeCaseRotateCase">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ChangeCaseRotateCase</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:ChangeCaseRotateCase</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuHome-separator2">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuHome-ChangeCaseToSentenceCase">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ChangeCaseToSentenceCase</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:ChangeCaseToSentenceCase</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuHome-ChangeCaseToTitleCase">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ChangeCaseToTitleCase</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:ChangeCaseToTitleCase</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuHome-ChangeCaseToToggleCase">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ChangeCaseToToggleCase</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:ChangeCaseToToggleCase</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuHome-separator3">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuHome-InsertNonBreakingSpace">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertNonBreakingSpace</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:InsertNonBreakingSpace</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuHome-InsertHardHyphen">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertHardHyphen</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:InsertHardHyphen</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuHome-InsertSoftHyphen">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertSoftHyphen</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:InsertSoftHyphen</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuHome-InsertZWSP">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertZWSP</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:InsertZWSP</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuHome-InsertWJ">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertWJ</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:InsertWJ</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuHome-InsertLRM">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertLRM</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:InsertLRM</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuHome-InsertRLM">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertRLM</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:InsertRLM</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuHome-separator4">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuHome-FontDialog">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:FontDialog</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:FontDialog</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuHome-ParagraphDialog">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ParagraphDialog</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:ParagraphDialog</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuHome-separator5">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkRadioMenuItem" id="MenuHome-ParaLeftToRight">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ParaLeftToRight</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:ParaLeftToRight</property>
       </object>
     </child>
     <child>
       <object class="GtkRadioMenuItem" id="MenuHome-ParaRightToLeft">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ParaRightToLeft</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:ParaRightToLeft</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuHome-separator6">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuHome-SelectAll">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SelectAll</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:SelectAll</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuHome-separator7">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuHome-FocusToFindbar">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">vnd.sun.star.findbar:FocusToFindbar</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">vnd.sun.star.findbar:FocusToFindbar</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuHome-SearchDialog">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SearchDialog</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:SearchDialog</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuHome-RestoreEditingView">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:RestoreEditingView</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:RestoreEditingView</property>
       </object>
     </child>
   </object>
   <object class="GtkMenu" id="Menu Image">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <child>
       <object class="GtkMenuItem" id="MenuImage-ImageCrop">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Crop</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:Crop</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuImage-ExternalEdit">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ExternalEdit</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:ExternalEdit</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuImage-ChangePicture">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ChangePicture</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:ChangePicture</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuImage-CompressGraphic">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:CompressGraphic</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:CompressGraphic</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuImage-SaveGraphic">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SaveGraphic</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:SaveGraphic</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator62">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuImage-OriginalSize">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:OriginalSize</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:OriginalSize</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuImage-ImageMapDialog">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ImageMapDialog</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:ImageMapDialog</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator139">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuImage-NameGroup">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:NameGroup</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:NameGroup</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuImage-ObjectTitleDescription">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ObjectTitleDescription</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:ObjectTitleDescription</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator10">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuImage-AnimationEffects">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:AnimationEffects</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:AnimationEffects</property>
       </object>
     </child>
   </object>
   <object class="GtkMenu" id="Menu Insert">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <child>
       <object class="GtkMenuItem" id="MenuInsert-PhotoAlbumDialog">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:PhotoAlbumDialog</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:PhotoAlbumDialog</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuInsert-AnimationObjects">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:AnimationObjects</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:AnimationObjects</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuInsert-separator1">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuInsert-Gallery">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Gallery</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:Gallery</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuInsert-TwainSelect">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:TwainSelect</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:TwainSelect</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuInsert-InsertAVMedia">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertAVMedia</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:InsertAVMedia</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuInsert-separator2">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuInsert-InsertQrCode">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertQrCode</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:InsertQrCode</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuInsert-InsertObject">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertObject</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:InsertObject</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuInsert-ImportFromFile">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ImportSlideFromFile</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:ImportSlideFromFile</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuInsert-InsertMath">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertMath</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:InsertMath</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuInsert-separator3">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuInsert-DrawText">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Text</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:Text</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuInsert-VerticalText">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:VerticalText</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:VerticalText</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuInsert-FontworkGalleryFloater">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:FontworkGalleryFloater</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:FontworkGalleryFloater</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuInsert-separator4">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuInsert-HyperlinkDialog">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:HyperlinkDialog</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:HyperlinkDialog</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuInsert-CapturePoint">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:CapturePoint</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:CapturePoint</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuInsert-separator5">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuInsert-InsertPageField">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertSlideField</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:InsertSlideField</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuInsert-InsertPagesField">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertSlidesField</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:InsertSlidesField</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuInsert-HeaderAndFooter">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:HeaderAndFooter</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:HeaderAndFooter</property>
       </object>
     </child>
   </object>
   <object class="GtkMenu" id="Menu Master">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <child>
       <object class="GtkMenuItem" id="InsertMasterPageD1">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertMasterPage</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:InsertMasterPage</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="RenameMasterPageD1">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:RenameMasterPage</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:RenameMasterPage</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="DeleteMasterPageD1">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:DeleteMasterPage</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:DeleteMasterPage</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="CloseMasterViewD1">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:CloseMasterView</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:CloseMasterView</property>
       </object>
     </child>
   </object>
   <object class="GtkMenu" id="Menu Media">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <child>
       <object class="GtkMenuItem" id="MenuMedia-AVMediaPlayer">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:AVMediaPlayer</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:AVMediaPlayer</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuMedia-separator1">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuMedia-NameGroup">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:NameGroup</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:NameGroup</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuMedia-ObjectTitleDescription">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ObjectTitleDescription</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:ObjectTitleDescription</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuMedia-separator2">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuMedia-AnimationEffects">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:AnimationEffects</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:AnimationEffects</property>
       </object>
     </child>
   </object>
   <object class="GtkMenu" id="Menu Object">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <child>
       <object class="GtkMenuItem" id="MenuObject-ChainFrames">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ChainFrames</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:ChainFrames</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuObject-UnhainFrames">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:UnhainFrames</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:UnhainFrames</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuObject-separator">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuObject-NameGroup">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:NameGroup</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:NameGroup</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuObject-ObjectTitleDescription">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ObjectTitleDescription</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:ObjectTitleDescription</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuObject-FrameDialog">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:FrameDialog</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:FrameDialog</property>
       </object>
     </child>
   </object>
   <object class="GtkMenu" id="Menu Reference">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <child>
       <object class="GtkMenuItem" id="MenuReference-InsertFootnoteDialog">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertFootnoteDialog</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:InsertFootnoteDialog</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuReference-separator1">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuReference-AddressBookSource">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:AddressBookSource</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:AddressBookSource</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuReference-separator2">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuReference-UpdateAll">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:UpdateAll</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:UpdateAll</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuReference-Repaginate">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Repaginate</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:Repaginate</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuReference-UpdateFields">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:UpdateFields</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:UpdateFields</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuReference-UpdateAllIndexes">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:UpdateAllIndexes</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:UpdateAllIndexes</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuReference-UpdateCurIndex">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:UpdateCurIndex</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:UpdateCurIndex</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuReference-UpdateAllLinks">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:UpdateAllLinks</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:UpdateAllLinks</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuReference-UpdateCharts">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:UpdateCharts</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:UpdateCharts</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuReference-CalculateSel">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:CalculateSel</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:CalculateSel</property>
       </object>
     </child>
   </object>
   <object class="GtkMenu" id="Menu Review">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <child>
       <object class="GtkMenuItem" id="MenuReview-SpellDialog">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SpellDialog</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:SpellDialog</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuReview-SpellOnline">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SpellOnline</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:SpellOnline</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuReview-ThesaurusDialog">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ThesaurusDialog</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:ThesaurusDialog</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuReview-separator1">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuReview-SetLanguageAllTextMenu">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SetLanguageAllTextMenu</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:SetLanguageAllTextMenu</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuReview-Hyphenation">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Hyphenation</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:Hyphenation</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuReview-ChineseConversion">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ChineseConversion</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:ChineseConversion</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuReview-HangulHanjaConversion">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:HangulHanjaConversion</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:HangulHanjaConversion</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuReview-MoreDictionaries">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:MoreDictionaries</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:MoreDictionaries</property>
       </object>
     </child>
   </object>
   <object class="GtkMenu" id="Menu Slide">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <child>
       <object class="GtkMenuItem" id="MenuSlide-InsertSlide">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertSlide</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:InsertSlide</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuSlide-DuplicateSlide">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:DuplicateSlide</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:DuplicateSlide</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuSlide-DeleteSlide">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:DeleteSlide</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:DeleteSlide</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuSlide-separator1">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuSlide-ModifyPage">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ModifyPage</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:ModifyPage</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuSlide-SlideSetup">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SlideSetup</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:SlideSetup</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuSlide-SelectBackground">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SelectBackground</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:SelectBackground</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuSlide-separator2">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuSlide-InsertMasterPage">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertMasterPage</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:InsertMasterPage</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuSlide-DeleteMasterPage">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:DeleteMasterPage</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:DeleteMasterPage</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuSlide-separator3">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuSlide-PresentationLayout">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:PresentationLayout</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:PresentationLayout</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuSlide-DisplayMasterBackground">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:DisplayMasterBackground</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:DisplayMasterBackground</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuSlide-DisplayMasterObjects">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:DisplayMasterObjects</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:DisplayMasterObjects</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuSlide-separator4">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuSlide-HideSlide">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:HideSlide</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:HideSlide</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuSlide-ShowSlide">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ShowSlide</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:ShowSlide</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuSlide-RenameSlide">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:RenameSlide</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:RenameSlide</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuSlide-separator5">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuSlide-ImportSlideFromFile">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ImportSlideFromFile</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:ImportSlideFromFile</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuSlide-SummaryPage">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SummaryPage</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:SummaryPage</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuSlide-ExpandPage">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ExpandPage</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:ExpandPage</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuSlide-separator6">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuSlide-MoveSlideUp">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:MoveSlideUp</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:MoveSlideUp</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuSlide-MoveSlideDown">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:MoveSlideDown</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:MoveSlideDown</property>
       </object>
     </child>
   </object>
   <object class="GtkMenu" id="Menu Slide Show">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <child>
       <object class="GtkMenuItem" id="MenuSlideShow-Presentation">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Presentation</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:Presentation</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuSlideShow-PresentationCurrentSlide">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:PresentationCurrentSlide</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:PresentationCurrentSlide</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuSlideShow-separator1">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuSlideShow-RehearseTimings">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:RehearseTimings</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:RehearseTimings</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuSlideShow-CustomShowDialog">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:CustomShowDialog</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:CustomShowDialog</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuSlideShow-Remote">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Remote</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:Remote</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuSlideShow-separator2">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuSlideShow-SlideChangeWindow">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SlideChangeWindow</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:SlideChangeWindow</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuSlideShow-CustomAnimation">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:CustomAnimation</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:CustomAnimation</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuSlideShow-separator3">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkRadioMenuItem" id="MenuSlideShow-OutputQualityColor">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:OutputQualityColor</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:OutputQualityColor</property>
       </object>
     </child>
     <child>
       <object class="GtkRadioMenuItem" id="MenuSlideShow-OutputQualityGrayscale">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:OutputQualityGrayscale</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:OutputQualityGrayscale</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuSlideShow-separator">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuSlideShow-PresentationMinimizer">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:PresentationMinimizer</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:PresentationMinimizer</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuSlideShow-PresentationDialog">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:PresentationDialog</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:PresentationDialog</property>
       </object>
     </child>
   </object>
   <object class="GtkMenu" id="Menu Table">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <child>
       <object class="GtkMenuItem" id="MenuTable-AutoFormat">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:AutoFormat</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:AutoFormat</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuTable-ObjectAlign">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ObjectAlign</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:ObjectAlign</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuTable-separator1">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuTable-InsertRowDialog">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertRowDialog</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:InsertRowDialog</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuTable-InsertColumnDialog">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertColumnDialog</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:InsertColumnDialog</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuTable-separator2">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuTable-SetRowHeight">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SetRowHeight</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:SetRowHeight</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuTable-SetOptimalRowHeight">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SetOptimalRowHeight</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:SetOptimalRowHeight</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuTable-DistributeRows">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:DistributeRows</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:DistributeRows</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuTable-SetColumnWidth">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SetColumnWidth</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:SetColumnWidth</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuTable-SetOptimalColumnWidth">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SetOptimalColumnWidth</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:SetOptimalColumnWidth</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuTable-DistributeColumns">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:DistributeColumns</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:DistributeColumns</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuTable-separator3">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuTable-Protect">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Protect</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:Protect</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuTable-UnsetCellsReadOnly">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:UnsetCellsReadOnly</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:UnsetCellsReadOnly</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuTable-separator4">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuTable-HeadingRowsRepeat">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:HeadingRowsRepeat</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:HeadingRowsRepeat</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuTable-RowSplit">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:RowSplit</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:RowSplit</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuTable-separator5">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuTable-ConvertTextToTable">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ConvertTextToTable</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:ConvertTextToTable</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuTable-ConvertTableToText">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ConvertTableToText</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:ConvertTableToText</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuTable-separator6">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuTable-TableSort">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:TableSort</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:TableSort</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuTable-MergeTable">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:MergeTable</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:MergeTable</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuTable-TableNumberRecognition">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:TableNumberRecognition</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:TableNumberRecognition</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuTable-TableBoundaries">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:TableBoundaries</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:TableBoundaries</property>
       </object>
     </child>
   </object>
   <object class="GtkMenu" id="Menu Tools">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <child>
       <object class="GtkMenuItem" id="MenuTools-MacroRecorder">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:MacroRecorder</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:MacroRecorder</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuTools-RunMacro">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:RunMacro</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:RunMacro</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuTools-BasicIDEAppear">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:BasicIDEAppear</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:BasicIDEAppear</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuTools-MacroOrganizer">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:MacroOrganizer?TabId:short=1</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:MacroOrganizer?TabId:short=1</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuTools-ScriptOrganizer">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ScriptOrganizer</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:ScriptOrganizer</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuTools-MacroSignature">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:MacroSignature</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:MacroSignature</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuTools-DevTools">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:DevelopmentToolsDockingWindow</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:DevelopmentToolsDockingWindow</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuTools-separator1">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuTools-PresentationMinimizer">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:PresentationMinimizer</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:PresentationMinimizer</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuTools-BmpMask">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:BmpMask</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:BmpMask</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuTools-AVMediaPlayer">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:AVMediaPlayer</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:AVMediaPlayer</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuTools-separator2">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuTools-ViewDataSourceBrowser">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ViewDataSourceBrowser</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:ViewDataSourceBrowser</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuTools-separator3">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuTools-OpenXMLFilterSettings">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:OpenXMLFilterSettings</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:OpenXMLFilterSettings</property>
       </object>
     </child>
   </object>
   <object class="GtkMenu" id="Menu View">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <child>
       <object class="GtkRadioMenuItem" id="MenuView-NormalMultiPaneGUI">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:NormalMultiPaneGUI</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:NormalMultiPaneGUI</property>
       </object>
     </child>
     <child>
       <object class="GtkRadioMenuItem" id="MenuView-OutlineMode">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:OutlineMode</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:OutlineMode</property>
       </object>
     </child>
     <child>
       <object class="GtkRadioMenuItem" id="MenuView-NotesMode">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:NotesMode</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:NotesMode</property>
       </object>
     </child>
     <child>
       <object class="GtkRadioMenuItem" id="MenuView-DiaMode">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:DiaMode</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:DiaMode</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuView-separator1">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkRadioMenuItem" id="MenuView-SlideMasterPage">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SlideMasterPage</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:SlideMasterPage</property>
       </object>
     </child>
     <child>
       <object class="GtkRadioMenuItem" id="MenuView-NotesMasterPage">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:NotesMasterPage</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:NotesMasterPage</property>
       </object>
     </child>
     <child>
       <object class="GtkRadioMenuItem" id="MenuView-HandoutMode">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:HandoutMode</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:HandoutMode</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuView-separator2">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuView-Menubar">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Menubar</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:Menubar</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuView-Sidebar">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Sidebar</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:Sidebar</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuView-StatusBarVisible">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:StatusBarVisible</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:StatusBarVisible</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuView-separator3">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuView-LeftPaneImpress">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:LeftPaneImpress</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:LeftPaneImpress</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuView-ToggleTabBarVisibility">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ToggleTabBarVisibility</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:ToggleTabBarVisibility</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuView-ShowRuler">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ShowRuler</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:ShowRuler</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuView-separator4">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuView-GridUse">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:GridVisible</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:GridVisible</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuView-GridFront">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:GridUse</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:GridUse</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuView-separator5">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuView-HelplinesVisible">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:HelplinesVisible</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:HelplinesVisible</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuView-HelplinesUse">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:HelplinesUse</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:HelplinesUse</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuView-separator6">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkRadioMenuItem" id="MenuView-OutputQualityColor">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:OutputQualityColor</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:OutputQualityColor</property>
       </object>
     </child>
     <child>
       <object class="GtkRadioMenuItem" id="MenuView-OutputQualityGrayscale">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:OutputQualityGrayscale</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:OutputQualityGrayscale</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuView-separator7">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuView-ZoomPage">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ZoomPage</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:ZoomPage</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuView-Zoom100Percent">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Zoom100Percent</property>
+        <property name="can-focus">False</property>
+        <property name="action-name">.uno:Zoom100Percent</property>
       </object>
     </child>
   </object>
-  <object class="GtkImage" id="changebezierImg">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="pixbuf">cmd/lc_changebezier.png</property>
-  </object>
-  <object class="GtkImage" id="paragraphstylei">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="pixbuf">cmd/lc_insertfieldctrl.png</property>
-  </object>
   <!-- n-columns=1 n-rows=1 -->
   <object class="GtkGrid" id="NotebookBar">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <child>
       <object class="GtkBox" id="box1">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="sfxlo-NotebookbarTabControl" id="ContextContainer">
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
+            <property name="can-focus">True</property>
             <property name="hexpand">True</property>
             <child>
-              <object class="sfxlo-PriorityHBox" id="File Tab">
+              <object class="sfxlo-PriorityHBox" id="File">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <child>
-                  <object class="sfxlo-PriorityMergedHBox" id="File">
+                  <object class="sfxlo-PriorityMergedHBox" id="pmhbFile">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="valign">center</property>
-                    <property name="vexpand">True</property>
                     <child>
-                      <object class="VclOptionalBox" id="File-Section-New">
+                      <!-- n-columns=3 n-rows=3 -->
+                      <object class="GtkGrid" id="gdFileNew">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">6</property>
+                        <property name="margin-end">3</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
                         <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom">
+                          <object class="GtkLabel" id="lbFileNew">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">end</property>
+                            <property name="vexpand">True</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|labelFileNew">New</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gdFileNew"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                            <property name="width">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxFileAddDirect">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
+                            <property name="toolbar-style">both</property>
+                            <property name="show-arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkMenuToolButton" id="File-AddDirect">
+                              <object class="GtkMenuToolButton" id="btnFileAddDirect">
                                 <property name="visible">True</property>
-                                <property name="action_name">.uno:AddDirect</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:AddDirect</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -2380,11 +2385,74 @@
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">2</property>
                           </packing>
                         </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxFileSearchDialog">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnFileNewDoc">
+                                <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>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxFileSaveAsTemplate">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnFileSaveAsTemplate">
+                                <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>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">2</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
+                          </packing>
+                        </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbFileNew"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -2393,75 +2461,184 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="VclOptionalBox" id="File-Section-New1">
+                      <!-- n-columns=5 n-rows=3 -->
+                      <object class="GtkGrid" id="gdFileFile">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">3</property>
+                        <property name="margin-end">3</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
                         <child>
-                          <object class="GtkBox" id="GroupB2">
+                          <object class="GtkLabel" id="lbFileFile">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">end</property>
+                            <property name="vexpand">True</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|labelFileFile">File</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gdFileFile"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                            <property name="width">4</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxFileOpen">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
                             <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
+                            <property name="vexpand">True</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="LineA3">
+                              <object class="GtkToolButton" id="btnFileOpen">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="File-NewDoc1">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:NewDoc</property>
-                                    <property name="use_underline">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:Open</property>
+                                <property name="use-underline">True</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineB2">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="File-SaveAsTemplate1">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:SaveAsTemplate</property>
-                                    <property name="use_underline">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
+                                <property name="homogeneous">True</property>
                               </packing>
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">2</property>
                           </packing>
                         </child>
-                        <style>
-                          <class name="priority-6"/>
-                        </style>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxFileSave">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">center</property>
+                            <property name="vexpand">True</property>
+                            <property name="toolbar-style">both</property>
+                            <property name="show-arrow">False</property>
+                            <property name="icon_size">3</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnFileSave">
+                                <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>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxFileExportTo">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">center</property>
+                            <property name="margin-start">3</property>
+                            <property name="vexpand">True</property>
+                            <property name="toolbar-style">both</property>
+                            <property name="show-arrow">False</property>
+                            <property name="icon_size">3</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnFileExportTo">
+                                <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>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">2</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxFileExportDirectToPDF">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnFileExportDirectToPDF">
+                                <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>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">3</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">4</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxFileSendMail">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnFileSendMail">
+                                <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>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">3</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbFileFile"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -2470,40 +2647,31 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="VclOptionalBox" id="File-Section-Open">
+                      <!-- n-columns=3 n-rows=3 -->
+                      <object class="GtkGrid" id="gdFilePrint">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">3</property>
+                        <property name="margin-end">3</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
                         <child>
-                          <object class="GtkSeparator" id="separator92">
+                          <object class="sfxlo-NotebookbarToolBox" id="bxFilePrint">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom59">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                            <property name="can-focus">False</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
+                            <property name="toolbar-style">both</property>
+                            <property name="show-arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="File-Open">
+                              <object class="GtkToolButton" id="btFilePrint">
                                 <property name="visible">True</property>
-                                <property name="action_name">.uno:Open</property>
-                                <property name="use_underline">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:Print</property>
+                                <property name="use-underline">True</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -2512,11 +2680,95 @@
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">2</property>
                           </packing>
                         </child>
+                        <child>
+                          <object class="GtkLabel" id="lbFilePrint">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">end</property>
+                            <property name="vexpand">True</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|labelFilePrint">Print</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gdFilePrint"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                            <property name="width">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxFilePrintDefault">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnFilePrintDefault">
+                                <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>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxFileWebHtml">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnFileWebHtml">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:WebHtml</property>
+                                <property name="use-underline">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">2</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
+                          </packing>
+                        </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbFilePrint"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -2525,40 +2777,31 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="VclOptionalBox" id="File-Section-Save">
+                      <!-- n-columns=3 n-rows=3 -->
+                      <object class="GtkGrid" id="gdFileProperties">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">3</property>
+                        <property name="margin-end">6</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
                         <child>
-                          <object class="GtkSeparator" id="separator13">
+                          <object class="sfxlo-NotebookbarToolBox" id="bxFileSetDocumentProperties">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom4">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                            <property name="can-focus">False</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
+                            <property name="toolbar-style">both</property>
+                            <property name="show-arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="File-Save">
+                              <object class="GtkToolButton" id="btnFileSetDocumentProperties">
                                 <property name="visible">True</property>
-                                <property name="action_name">.uno:Save</property>
-                                <property name="use_underline">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:SetDocumentProperties</property>
+                                <property name="use-underline">True</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -2567,11 +2810,95 @@
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">2</property>
                           </packing>
                         </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxFileSignature">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnFileSignature">
+                                <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>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxFileSignPDF">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnFileSignPDF">
+                                <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>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">2</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="lbFileProperties">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">end</property>
+                            <property name="vexpand">True</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|labelFileProperties">Properties</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gdFileProperties"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                            <property name="width">3</property>
+                          </packing>
+                        </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbFileProperties"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -2579,402 +2906,6 @@
                         <property name="position">3</property>
                       </packing>
                     </child>
-                    <child>
-                      <object class="VclOptionalBox" id="File-Section-Export">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator93">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom66">
-                            <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</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="File-ExportTo">
-                                <property name="visible">True</property>
-                                <property name="action_name">.uno:ExportTo</property>
-                                <property name="use_underline">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">4</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="File-Section-Export1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB5">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineA4">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="File-ExportDirectToPDF1">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:ExportDirectToPDF</property>
-                                    <property name="use_underline">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineB5">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="File-SendMail">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:SendMail</property>
-                                    <property name="use_underline">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-3"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">5</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="File-Section-Print">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator6">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom2">
-                            <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</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="File-Print">
-                                <property name="visible">True</property>
-                                <property name="action_name">.uno:Print</property>
-                                <property name="use_underline">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">6</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="File-Section-Print1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB6">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineA5">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="File-PrintDefault1">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:PrintDefault</property>
-                                    <property name="use_underline">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineB6">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="File-WebHtml">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:WebHtml</property>
-                                    <property name="use_underline">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-2"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">7</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="File-Section-Property">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator91">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom6">
-                            <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</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="File-SetDocumentProperties">
-                                <property name="visible">True</property>
-                                <property name="action_name">.uno:SetDocumentProperties</property>
-                                <property name="use_underline">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">8</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="File-Section-Property1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB1">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineA1">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="File-Signature1">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:Signature</property>
-                                    <property name="use_underline">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineB1">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="File-SignPDF1">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:SignPDF</property>
-                                    <property name="use_underline">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-1"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">9</property>
-                      </packing>
-                    </child>
                   </object>
                   <packing>
                     <property name="expand">True</property>
@@ -2985,96 +2916,30 @@
                 <child>
                   <object class="sfxlo-DropdownBox" id="File-Menu">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="halign">end</property>
                     <property name="valign">center</property>
                     <property name="vexpand">True</property>
-                    <child>
-                      <object class="GtkBox" id="GroupB8">
-                        <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>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom80">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="halign">end</property>
-                            <property name="hexpand">True</property>
-                            <property name="toolbar_style">icons</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">1</property>
-                            <child>
-                              <object class="GtkToolButton" id="File-CloseDoc">
-                                <property name="visible">True</property>
-                                <property name="action_name">.uno:CloseDoc</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom1">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="halign">end</property>
-                            <property name="hexpand">True</property>
-                            <property name="toolbar_style">icons</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">1</property>
-                            <child>
-                              <object class="GtkToolButton" id="File-HelpIndex">
-                                <property name="visible">True</property>
-                                <property name="action_name">.uno:HelpIndex</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
                     <child>
                       <object class="GtkBox" id="GroupB7">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="valign">center</property>
                         <property name="margin-end">5</property>
                         <property name="vexpand">True</property>
                         <property name="orientation">vertical</property>
                         <child>
                           <object class="svtlo-ManagedMenuButton" id="File-FileButton:Menu File">
-                            <property name="label" translatable="yes" context="impressnotebookbar|FileLabel">_File</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|FileMenuLabel">_File</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="focus_on_click">False</property>
-                            <property name="receives_default">False</property>
+                            <property name="can-focus">True</property>
+                            <property name="focus-on-click">False</property>
+                            <property name="receives-default">False</property>
                             <property name="halign">end</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
                             <property name="relief">none</property>
-                            <property name="use_underline">True</property>
+                            <property name="use-underline">True</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -3084,165 +2949,16 @@
                         </child>
                         <child>
                           <object class="svtlo-ManagedMenuButton" id="File-HelpButton:Menu Help">
-                            <property name="label" translatable="yes" context="impressnotebookbar|HelpMenuButton">_Help</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|FileMenuHelp">_Help</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="focus_on_click">False</property>
-                            <property name="receives_default">False</property>
+                            <property name="can-focus">True</property>
+                            <property name="focus-on-click">False</property>
+                            <property name="receives-default">False</property>
                             <property name="halign">end</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
                             <property name="relief">none</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="pack_type">end</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkSeparator" id="separator3">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">end</property>
-                    <property name="margin-start">5</property>
-                    <property name="margin_top">5</property>
-                    <property name="margin_bottom">5</property>
-                    <property name="orientation">vertical</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="padding">5</property>
-                    <property name="pack_type">end</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-              </object>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="FileLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="impressnotebookbar|FileLabel">~File</property>
-                <property name="use_underline">True</property>
-              </object>
-              <packing>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <object class="sfxlo-PriorityHBox" id="Home Tab">
-                <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-PriorityMergedHBox" id="Home">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="valign">center</property>
-                    <property name="vexpand">True</property>
-                    <child>
-                      <object class="VclOptionalBox" id="Home-Section-Clipboard">
-                        <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="SectionBottom87">
-                            <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</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkMenuToolButton" id="Home-Paste">
-                                <property name="visible">True</property>
-                                <property name="action_name">.uno:Paste</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">False</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="GroupB9">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineA6">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Home-Cut">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:Cut</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineB7">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Home-Copy">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:Copy</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
+                            <property name="use-underline">True</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -3257,93 +2973,623 @@
                         <property name="position">0</property>
                       </packing>
                     </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="pack-type">end</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel" id="FileLabel">
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+                <property name="label" translatable="yes" context="TabbedImpress|FileTabLabel">~File</property>
+                <property name="use-underline">True</property>
+              </object>
+              <packing>
+                <property name="tab-fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="sfxlo-PriorityHBox" id="Home Tab">
+                <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-PriorityMergedHBox" id="pmhbHome">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="valign">center</property>
+                    <property name="vexpand">True</property>
                     <child>
-                      <object class="VclOptionalBox" id="Home-Section-Style">
+                      <!-- n-columns=3 n-rows=3 -->
+                      <object class="GtkGrid" id="gdHomeClipboard">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">6</property>
+                        <property name="margin-end">3</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
                         <child>
-                          <object class="GtkSeparator" id="separator7">
+                          <object class="GtkLabel" id="lbHomeClipboard">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">end</property>
+                            <property name="vexpand">True</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|labelHomeClipboard">Clipboard</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gdHomeClipboard"/>
+                            </accessibility>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                            <property name="width">2</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkBox" id="GroupB13">
+                          <object class="sfxlo-NotebookbarToolBox" id="bxHomePaste">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
+                            <property name="vexpand">True</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="LineA7">
+                              <object class="GtkMenuToolButton" id="btnHomePaste">
                                 <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="Home-FormatPaintbrush">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:FormatPaintbrush</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:Paste</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineB8">
-                                <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="Home-SetDefault">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:SetDefault</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
+                                <property name="homogeneous">False</property>
                               </packing>
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">2</property>
                           </packing>
                         </child>
-                        <style>
-                          <class name="priority-8"/>
-                        </style>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxHomeCut">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnHomeCut">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:Cut</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxHomeCopy">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnHomeCopy">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:Copy</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">2</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
+                          </packing>
+                        </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbHomeClipboard"/>
+                        </accessibility>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <!-- n-columns=3 n-rows=3 -->
+                      <object class="GtkGrid" id="gdHomeSlide">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">3</property>
+                        <property name="margin-end">3</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
+                        <child>
+                          <object class="GtkLabel" id="lbHomeSlide">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">end</property>
+                            <property name="vexpand">True</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|labelHomeSlide">Slide</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gdHomeSlide"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                            <property name="width">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxHomeInsertSlide">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">center</property>
+                            <property name="vexpand">True</property>
+                            <property name="toolbar-style">both</property>
+                            <property name="show-arrow">False</property>
+                            <property name="icon_size">3</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnHomeInsertSlide">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:InsertSlide</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">False</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">2</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxHomeDuplicatePage">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnHomeDuplicatePage">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:DuplicateSlide</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxHomePresentationLayout">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</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="btnHomePresentationLayout">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:PresentationLayout</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbHomeSlide"/>
+                        </accessibility>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <!-- n-columns=6 n-rows=3 -->
+                      <object class="GtkGrid" id="gdHomeFont">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">3</property>
+                        <property name="margin-end">3</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
+                        <child>
+                          <object class="GtkLabel" id="lbHomeFont">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">end</property>
+                            <property name="vexpand">True</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|labelHomeFont">Font</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gdHomeFont"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                            <property name="width">5</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxHomeFormatPaintbrush">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</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="btnHomeFormatPaintbrush">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:FormatPaintbrush</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxHomeSetDefaults">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</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="btnHomeSetDefault">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:SetDefault</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxHomeCharFontName">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">center</property>
+                            <property name="hexpand">True</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnHomeCharFontName">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="hexpand">True</property>
+                                <property name="action-name">.uno:CharFontName</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
+                            <property name="width">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxHomeFontHeight">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">center</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnHomeFontHeight">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:FontHeight</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">3</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxHomeCharFormat">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">center</property>
+                            <property name="toolbar-style">icons</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnHomeBold">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:Bold</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnHomeItalic">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:Italic</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnHomeUnderline">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:Underline</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnHomeStrikeout">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:Strikeout</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnHomeShadowed">
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:Shadowed</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxHomeScript">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">center</property>
+                            <property name="toolbar-style">icons</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnHomeSubScript">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:SubScript</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnHomeSuperScript">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:SuperScript</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">2</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxHomeCharColor">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">center</property>
+                            <property name="toolbar-style">icons</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkMenuToolButton" id="btnHomeSpacing">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:Spacing</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkMenuToolButton" id="btnHomeBackColor">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:CharBackColor</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkMenuToolButton" id="btnHomeColor">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:Color</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">False</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">3</property>
+                            <property name="top-attach">1</property>
+                            <property name="width">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxHomeFontSize">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">center</property>
+                            <property name="toolbar-style">icons</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnHomeGrow">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:Grow</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnHomeShrink">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:Shrink</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">4</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">5</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
+                          </packing>
+                        </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbHomeFont"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -3352,256 +3598,292 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="VclOptionalBox" id="Home-Section-Format">
+                      <!-- n-columns=4 n-rows=3 -->
+                      <object class="GtkGrid" id="gdHomeParagraph">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">3</property>
+                        <property name="margin-end">6</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
                         <child>
-                          <object class="GtkBox" id="GroupB10">
+                          <object class="GtkLabel" id="lbHomeParagraph">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">end</property>
+                            <property name="vexpand">True</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|labelHomeParagraph">Paragraph</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gdHomeParagraph"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                            <property name="width">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
                             <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">3</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxHomeList">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">center</property>
+                            <property name="margin-end">6</property>
+                            <property name="toolbar-style">icons</property>
+                            <property name="show-arrow">False</property>
                             <child>
-                              <object class="GtkBox" id="box76">
+                              <object class="GtkToolButton" id="btnHomeDefaultBullet">
                                 <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="font">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="valign">center</property>
-                                    <property name="hexpand">True</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="Home-CharFontName">
-                                        <property name="visible">True</property>
-                                        <property name="hexpand">True</property>
-                                        <property name="action_name">.uno:CharFontName</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">True</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="fontheight">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="valign">center</property>
-                                    <property name="margin-start">5</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="Home-FontHeight">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:FontHeight</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">True</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="ExtTop6">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="halign">end</property>
-                                    <property name="valign">center</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="Home-Grow">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:Grow</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Home-Shrink">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:Shrink</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</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>
-                                  </packing>
-                                </child>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:DefaultBullet</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
+                                <property name="homogeneous">True</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkBox" id="GroupB11">
+                              <object class="GtkToolButton" id="btnHomeDefaultNumbering">
                                 <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="ExtTop4">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="Home-Bold">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:Bold</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Home-Italic">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:Italic</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Home-Underline">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:Underline</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Home-Strikeout">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:Strikeout</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Home-Shadowed">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:Shadowed</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkSeparator" id="separator78">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="halign">end</property>
-                                    <property name="margin_top">5</property>
-                                    <property name="margin_bottom">5</property>
-                                    <property name="hexpand">True</property>
-                                    <property name="orientation">vertical</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="padding">5</property>
-                                    <property name="position">2</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="ExtTop2">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="valign">center</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkMenuToolButton" id="Home-Spacing">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:Spacing</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">False</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkMenuToolButton" id="Home-CharBackColor">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:CharBackColor</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">False</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkMenuToolButton" id="Home-Color">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:Color</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">False</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">3</property>
-                                  </packing>
-                                </child>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:DefaultNumbering</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">2</property>
+                                <property name="homogeneous">True</property>
                               </packing>
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
                           </packing>
                         </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxHomeAlignment">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">center</property>
+                            <property name="margin-end">6</property>
+                            <property name="toolbar-style">icons</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnHomeStartPara">
+                                <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:StartPara</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnHomeCenterPara">
+                                <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:CenterPara</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnHomeRightPara">
+                                <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:EndPara</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnHomeJustifyPara">
+                                <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:JustifyPara</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxHomeIndentation">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">icons</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnHomeIncrementIndent">
+                                <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:IncrementIndent</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnHomeDecrementIndent">
+                                <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:DecrementIndent</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnHomeHangingIndent">
+                                <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:HangingIndent</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxHomeLTRRTL">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">icons</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnHomeParaLeftToRight">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:ParaLeftToRight</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnHomeParaRightToLeft">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:ParaRightToLeft</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">2</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxHomeSpacing">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">icons</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkMenuToolButton" id="btnHomeLineSpacing">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="halign">end</property>
+                                <property name="action-name">.uno:LineSpacing</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnHomeParaspaceIncrease">
+                                <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:ParaspaceIncrease</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnHomeParaspaceDecrease">
+                                <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:ParaspaceDecrease</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbHomeParagraph"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -3609,924 +3891,6 @@
                         <property name="position">3</property>
                       </packing>
                     </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Home-Section-Paragraph">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator102">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="GroupB14">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="GtkBox" id="GroupB16">
-                                <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="SectionBottom9">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="valign">center</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="Home-CellVertTop">
-                                        <property name="visible">True</property>
-                                        <property name="halign">center</property>
-                                        <property name="hexpand">True</property>
-                                        <property name="action_name">.uno:CellVertTop</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Home-CellVertCenter">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:CellVertCenter</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Home-CellVertBottom">
-                                        <property name="visible">True</property>
-                                        <property name="halign">center</property>
-                                        <property name="hexpand">True</property>
-                                        <property name="action_name">.uno:CellVertBottom</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkBox" id="GroupB15">
-                                <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="SectionBottom13">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="valign">center</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="Home-LeftPara">
-                                        <property name="visible">True</property>
-                                        <property name="halign">center</property>
-                                        <property name="hexpand">True</property>
-                                        <property name="action_name">.uno:StartPara</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Home-CenterPara">
-                                        <property name="visible">True</property>
-                                        <property name="halign">center</property>
-                                        <property name="hexpand">True</property>
-                                        <property name="action_name">.uno:CenterPara</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Home-RightPara">
-                                        <property name="visible">True</property>
-                                        <property name="halign">center</property>
-                                        <property name="hexpand">True</property>
-                                        <property name="action_name">.uno:EndPara</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-7"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">4</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Home-Section-Paragraph2">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB31">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="GtkBox" id="GroupB95">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <child>
-                                  <object class="GtkSeparator" id="separator64">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="margin_top">5</property>
-                                    <property name="margin_bottom">5</property>
-                                    <property name="orientation">vertical</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="padding">5</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="SectionBottom98">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="valign">center</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="Home-DefaultBullet">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:DefaultBullet</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Home-DefaultNumbering">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:DefaultNumbering</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Home-SetOutline">
-                                        <property name="action_name">.uno:SetOutline</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</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>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkBox" id="GroupB97">
-                                <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="SectionBottom143">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="Home-JustifyPara1">
-                                        <property name="visible">True</property>
-                                        <property name="halign">center</property>
-                                        <property name="hexpand">True</property>
-                                        <property name="action_name">.uno:JustifyPara</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkSeparator" id="separator99">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="margin_top">5</property>
-                                    <property name="margin_bottom">5</property>
-                                    <property name="orientation">vertical</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="padding">5</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="SectionBottom144">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="halign">end</property>
-                                    <property name="valign">center</property>
-                                    <property name="hexpand">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkMenuToolButton" id="Home-LineSpacing1">
-                                        <property name="visible">True</property>
-                                        <property name="halign">end</property>
-                                        <property name="action_name">.uno:LineSpacing</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">False</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">2</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-6"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">5</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Home-Section-Paragraph3">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB98">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom145">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Home-OutlineRight">
-                                    <property name="visible">True</property>
-                                    <property name="halign">center</property>
-                                    <property name="hexpand">True</property>
-                                    <property name="action_name">.uno:OutlineRight</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Home-OutlineLeft">
-                                    <property name="visible">True</property>
-                                    <property name="halign">center</property>
-                                    <property name="hexpand">True</property>
-                                    <property name="action_name">.uno:OutlineLeft</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Home-ParaLeftToRight">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:ParaLeftToRight</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom146">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Home-ParaspaceIncrease">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:ParaspaceIncrease</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Home-ParaspaceDecrease">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:ParaspaceDecrease</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Home-ParaRightToLeft">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:ParaRightToLeft</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-5"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">6</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Home-Section-DrawSection">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator69">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom5">
-                            <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</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Home-Text">
-                                <property name="visible">True</property>
-                                <property name="action_name">.uno:Text</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkToolButton" id="Home-VerticalText">
-                                <property name="visible">True</property>
-                                <property name="action_name">.uno:VerticalText</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-4"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">7</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Home-Section-DrawSection1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB43">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="GtkBox" id="GroupB12">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="valign">center</property>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="shapes12">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="Home-Line">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:Line</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Home-LineToolbox">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:LineToolbox</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkBox" id="GroupB38">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="valign">center</property>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="shapes15">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="Home-BasicShapes.rectangle">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:BasicShapes.rectangle</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Home-BasicShapes">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:BasicShapes</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-3"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">8</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Home-Section-DrawSection2">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB92">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="GtkBox" id="GroupB93">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="valign">center</property>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="shapes1">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="Home-ConnectorToolbox">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:ConnectorToolbox</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkSeparator" id="separator95">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="margin_top">5</property>
-                                    <property name="margin_bottom">5</property>
-                                    <property name="orientation">vertical</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="padding">5</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="LineA28">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="Home-XLineColor">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:XLineColor</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</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>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkBox" id="GroupB94">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="valign">center</property>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="shapes3">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="Home-FlowChartShapes">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:FlowChartShapes</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkSeparator" id="separator98">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="margin_top">5</property>
-                                    <property name="margin_bottom">5</property>
-                                    <property name="orientation">vertical</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="padding">5</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="LineB29">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="Home-FillColor">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:FillColor</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</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>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-2"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">9</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Home-Section-Slideshow">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator94">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="GroupB39">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineA9">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Home-Presentation">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:Presentation</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineB21">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Home-PresentationCurrentSlide">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:PresentationCurrentSlide</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-1"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">10</property>
-                      </packing>
-                    </child>
                   </object>
                   <packing>
                     <property name="expand">True</property>
@@ -4537,29 +3901,29 @@
                 <child>
                   <object class="sfxlo-DropdownBox" id="Home-Menu">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="halign">end</property>
                     <property name="valign">center</property>
                     <property name="vexpand">True</property>
                     <child>
                       <object class="GtkBox" id="PasteBox1">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="valign">center</property>
                         <property name="vexpand">True</property>
                         <property name="orientation">vertical</property>
                         <child>
                           <object class="svtlo-ManagedMenuButton" id="Home-HomeButton:Menu Home">
-                            <property name="label" translatable="yes" context="impressnotebookbar|HomeMenuButton">_Home</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|HomeMenuButton">_Home</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="focus_on_click">False</property>
-                            <property name="receives_default">False</property>
+                            <property name="can-focus">True</property>
+                            <property name="focus-on-click">False</property>
+                            <property name="receives-default">False</property>
                             <property name="halign">end</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
                             <property name="relief">none</property>
-                            <property name="use_underline">True</property>
+                            <property name="use-underline">True</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -4570,18 +3934,19 @@
                         <child>
                           <object class="sfxlo-NotebookbarToolBox" id="SectionBottom10">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                            <property name="can-focus">True</property>
                             <property name="halign">end</property>
                             <property name="valign">center</property>
                             <property name="hexpand">True</property>
                             <property name="vexpand">True</property>
-                            <property name="toolbar_style">icons</property>
-                            <property name="show_arrow">False</property>
+                            <property name="toolbar-style">icons</property>
+                            <property name="show-arrow">False</property>
                             <property name="icon_size">1</property>
                             <child>
                               <object class="GtkToolButton" id="Home-SearchDialog">
                                 <property name="visible">True</property>
-                                <property name="action_name">.uno:SearchDialog</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:SearchDialog</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -4591,8 +3956,9 @@
                             <child>
                               <object class="GtkToolButton" id="Home-Findbar">
                                 <property name="visible">True</property>
+                                <property name="can-focus">False</property>
                                 <property name="valign">center</property>
-                                <property name="action_name">.uno:Presentation</property>
+                                <property name="action-name">.uno:Presentation</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -4617,30 +3983,10 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
-                    <property name="pack_type">end</property>
+                    <property name="pack-type">end</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
-                <child>
-                  <object class="GtkSeparator" id="separator9">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">end</property>
-                    <property name="margin_top">5</property>
-                    <property name="margin_bottom">5</property>
-                    <property name="orientation">vertical</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="padding">5</property>
-                    <property name="pack_type">end</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -4649,9 +3995,9 @@
             <child type="tab">
               <object class="GtkLabel" id="HomeLabel">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="impressnotebookbar|HomeLabel">~Home</property>
-                <property name="use_underline">True</property>
+                <property name="can-focus">False</property>
+                <property name="label" translatable="yes" context="TabbedImpress|HomeTabLabel">~Home</property>
+                <property name="use-underline">True</property>
                 <style>
                   <class name="context-default"/>
                   <class name="context-any"/>
@@ -4662,38 +4008,77 @@
               </object>
               <packing>
                 <property name="position">1</property>
-                <property name="tab_fill">False</property>
+                <property name="tab-fill">False</property>
               </packing>
             </child>
             <child>
-              <object class="sfxlo-PriorityHBox" id="Insert Tab">
+              <object class="sfxlo-PriorityHBox" id="Insert">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <child>
-                  <object class="sfxlo-PriorityMergedHBox" id="Insert">
+                  <object class="sfxlo-PriorityMergedHBox" id="pmhbInsert">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="valign">center</property>
                     <property name="vexpand">True</property>
                     <child>
-                      <object class="VclOptionalBox" id="Insert-Section-Slide">
+                      <!-- n-columns=3 n-rows=3 -->
+                      <object class="GtkGrid" id="gdInsertSlide">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">6</property>
+                        <property name="margin-end">3</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
                         <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom24">
+                          <object class="GtkLabel" id="lbInsertSlide">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">end</property>
+                            <property name="vexpand">True</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|labelInsertSlide">Slide</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gdInsertSlide"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                            <property name="width">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">2</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxInsertInsertSlide">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
+                            <property name="toolbar-style">both</property>
+                            <property name="show-arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="Insert-InsertPage">
+                              <object class="GtkToolButton" id="btnInsertInsertSlide">
                                 <property name="visible">True</property>
-                                <property name="action_name">.uno:InsertSlide</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:InsertSlide</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -4702,11 +4087,60 @@
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">2</property>
                           </packing>
                         </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxInsertDuplicatePage">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnInsertDuplicatePage">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:DuplicateSlide</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxInsertImportSlideFromFile">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnInsertImportSlideFromFile">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:ImportSlideFromFile</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbInsertSlide"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -4715,73 +4149,152 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="VclOptionalBox" id="Insert-Section-Slide1">
+                      <!-- n-columns=4 n-rows=3 -->
+                      <object class="GtkGrid" id="gdInsertData">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">3</property>
+                        <property name="margin-end">3</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
                         <child>
-                          <object class="GtkBox" id="GroupB99">
+                          <object class="GtkLabel" id="lbInsertData">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">end</property>
+                            <property name="vexpand">True</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|labelInsertData">Data</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gdInsertData"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                            <property name="width">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
                             <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">3</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="boInsertTable">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">center</property>
+                            <property name="vexpand">True</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="LineB22">
+                              <object class="GtkToolButton" id="btnInsertInsertTable">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Insert-DuplicatePage">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:DuplicateSlide</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:InsertTable</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineA20">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Insert-ImportFromFile">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:ImportSlideFromFile</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
+                                <property name="homogeneous">True</property>
                               </packing>
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">2</property>
                           </packing>
                         </child>
-                        <style>
-                          <class name="priority-6"/>
-                        </style>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxInsertInsertObjectChart">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnInsertInsertObjectChart">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:InsertObjectChart</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxInsertInsertObject">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnInsertInsertObject">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:InsertObject</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxInsertInsertObjectStarMath">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">center</property>
+                            <property name="vexpand">True</property>
+                            <property name="toolbar-style">both</property>
+                            <property name="show-arrow">False</property>
+                            <property name="icon_size">3</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnInsertInsertObjectStarMath">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:InsertObjectStarMath</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">2</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">2</property>
+                          </packing>
+                        </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbInsertData"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -4790,39 +4303,63 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="VclOptionalBox" id="Insert-Section-Table">
+                      <!-- n-columns=3 n-rows=3 -->
+                      <object class="GtkGrid" id="gdInsertGraphic">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">3</property>
+                        <property name="margin-end">3</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
                         <child>
-                          <object class="GtkSeparator" id="separator15">
+                          <object class="GtkLabel" id="lbInsertGraphic">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">end</property>
+                            <property name="vexpand">True</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|labelInsertGraphic">Graphic</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gdInsertGraphic"/>
+                            </accessibility>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                            <property name="width">2</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom12">
+                          <object class="GtkSeparator">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">2</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxInsertInsertGraphic">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
+                            <property name="toolbar-style">both</property>
+                            <property name="show-arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="Insert-InserTable">
+                              <object class="GtkToolButton" id="btnInsertInsertGraphic">
                                 <property name="visible">True</property>
-                                <property name="action_name">.uno:InsertTable</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:InsertGraphic</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -4831,11 +4368,60 @@
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">2</property>
                           </packing>
                         </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxInsertGallery">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnInsertGallery">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:Gallery</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxInsertInsertAVMedia">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnInsertInsertAVMedia">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:InsertAVMedia</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbInsertGraphic"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -4844,73 +4430,156 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="VclOptionalBox" id="Insert-Section-Table1">
+                      <!-- n-columns=4 n-rows=3 -->
+                      <object class="GtkGrid" id="gdInsertText">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">3</property>
+                        <property name="margin-end">3</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
                         <child>
-                          <object class="GtkBox" id="GroupB22">
+                          <object class="GtkLabel" id="lbInsertText">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">end</property>
+                            <property name="vexpand">True</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|labelInsertText">Text</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gdInsertText"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                            <property name="width">4</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
                             <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">3</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxInsertCharmapControl">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">center</property>
+                            <property name="vexpand">True</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="LineB11">
+                              <object class="GtkToolButton" id="btnInsertCharmapControl">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Insert-InsertObjectChart">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:InsertObjectChart</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:CharmapControl</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineA10">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Insert-InsertObject">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:InsertObject</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</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="left-attach">2</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">2</property>
                           </packing>
                         </child>
-                        <style>
-                          <class name="priority-6"/>
-                        </style>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxInsertVerticalText">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</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="btnInsertVerticalText">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:VerticalText</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxInsertText">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</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="btnInsertText">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:Text</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxInsertHyperlinkDialog">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">center</property>
+                            <property name="vexpand">True</property>
+                            <property name="toolbar-style">both</property>
+                            <property name="show-arrow">False</property>
+                            <property name="icon_size">3</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnInsertHyperlinkDialog">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:HyperlinkDialog</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">2</property>
+                          </packing>
+                        </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbInsertText"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -4919,52 +4588,151 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="VclOptionalBox" id="Insert-Section-Image">
+                      <!-- n-columns=3 n-rows=3 -->
+                      <object class="GtkGrid" id="gdInsertFontwork">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">3</property>
+                        <property name="margin-end">3</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
                         <child>
-                          <object class="GtkSeparator" id="separator36">
+                          <object class="GtkLabel" id="lbInsertFontwork">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">end</property>
+                            <property name="vexpand">True</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|labelInsertFontwork">Fontwork</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gdInsertFontwork"/>
+                            </accessibility>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                            <property name="width">2</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom65">
+                          <object class="GtkSeparator">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">2</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxInsertFontworkGalleryFloater">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
+                            <property name="toolbar-style">both</property>
+                            <property name="show-arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="Insert-InsertGraphic">
+                              <object class="GtkToolButton" id="btnInsertFontworkGalleryFloater">
                                 <property name="visible">True</property>
-                                <property name="action_name">.uno:InsertGraphic</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:FontworkGalleryFloater</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
+                                <property name="homogeneous">False</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxFontworkTop">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</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="btnInsertFontworkShapeType">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:FontworkShapeType</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnInsertFontworkSameLetterHeights">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:FontworkSameLetterHeights</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">True</property>
-                            <property name="position">1</property>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
                           </packing>
                         </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxFontworkBottom">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</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="btnInsertFontworkAlignmentFloater">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:FontworkAlignmentFloater</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnInsertFontworkCharacterSpacingFloater">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:FontworkCharacterSpacingFloater</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbInsertFontwork"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -4973,73 +4741,278 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="VclOptionalBox" id="Insert-Section-Image1">
+                      <!-- n-columns=3 n-rows=3 -->
+                      <object class="GtkGrid" id="gdInsertDrawingObjects">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">3</property>
+                        <property name="margin-end">6</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
                         <child>
-                          <object class="GtkBox" id="GroupB23">
+                          <object class="GtkLabel" id="lbInsertDrawingObjects">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">end</property>
+                            <property name="vexpand">True</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|labelInsertDrawingObjects">Drawing Objects</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gdInsertDrawingObjects"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                            <property name="width">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
                             <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">2</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxInsertShapes1">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">icons</property>
+                            <property name="show-arrow">False</property>
                             <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineB12">
+                              <object class="GtkToolButton" id="btnInsertLine">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Insert-Gallery">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:Gallery</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:Line</property>
                               </object>
                               <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
+                                <property name="expand">True</property>
+                                <property name="homogeneous">True</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineA11">
+                              <object class="GtkToolButton" id="btnInsertArrowsToolbox">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Insert-PhotoAlbumDialog">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:PhotoAlbumDialog</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:ArrowsToolbox</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnInsertPolygon_Unfilled">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:Polygon_Unfilled</property>
+                                <property name="use-underline">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnInsertBezier_Unfilled">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:Bezier_Unfilled</property>
+                                <property name="use-underline">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnInsertObjects3DToolbox">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:Objects3DToolbox</property>
+                                <property name="use-underline">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</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="left-attach">0</property>
+                            <property name="top-attach">0</property>
                           </packing>
                         </child>
-                        <style>
-                          <class name="priority-5"/>
-                        </style>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxInsertShapes2">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">icons</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnInsertLineToolbox">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:LineToolbox</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnInsertBasicShapes.rectangle">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:BasicShapes.rectangle</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnInsertBasicShapes.ellipse">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:BasicShapes.ellipse</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnInsertDrawCaption">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:DrawCaption</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnInsertConnectorToolbox">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:ConnectorToolbox</property>
+                                <property name="use-underline">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxInsertShapes3">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="margin-start">6</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnInsertBasicShapes">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:BasicShapes</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnInsertSymbolShapes">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:SymbolShapes</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnInsertArrowShapes">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:ArrowShapes</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxInsertShapes4">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="margin-start">6</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnInsertStarShapes">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:StarShapes</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnInsertCalloutShapes">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:CalloutShapes</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnInsertFlowChartShapes">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:FlowChartShapes</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbInsertDrawingObjects"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -5047,706 +5020,6 @@
                         <property name="position">5</property>
                       </packing>
                     </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Insert-Section-Media">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator49">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom103">
-                            <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</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Insert-InsertAVMedia1">
-                                <property name="visible">True</property>
-                                <property name="action_name">.uno:InsertAVMedia</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">6</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Insert-Section-Hyperlink">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator33">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom34">
-                            <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</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Insert-HyperlinkDialog">
-                                <property name="visible">True</property>
-                                <property name="action_name">.uno:HyperlinkDialog</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">7</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Insert-Section-Hyperlink1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB19">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineA18">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Insert-FontworkGalleryFloater">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:FontworkGalleryFloater</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineB10">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Insert-CapturePoint">
-                                    <property name="visible">True</property>
-                                    <property name="valign">center</property>
-                                    <property name="action_name">.uno:CapturePoint</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">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-4"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">8</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Insert-Section-Field">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator17">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="svtlo-ManagedMenuButton" id="Insert-FieldButton:Menu Field">
-                            <property name="label" translatable="yes" context="impressnotebookbar|FieldMenuButton">Fiel_d</property>
-                            <property name="width_request">70</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                            <property name="action_name">.uno:FieldMenu</property>
-                            <property name="image">paragraphstylei</property>
-                            <property name="relief">none</property>
-                            <property name="use_underline">True</property>
-                            <property name="image_position">top</property>
-                            <property name="always_show_image">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">9</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Insert-Section-DrawText">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator28">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom97">
-                            <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</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Insert-Text">
-                                <property name="visible">True</property>
-                                <property name="action_name">.uno:Text</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom82">
-                            <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</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Insert-VerticalText">
-                                <property name="visible">True</property>
-                                <property name="action_name">.uno:VerticalText</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</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>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">10</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Insert-Section-Draw">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB59">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="shapes2">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Insert-Line1">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:Line</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Insert-Polygon_Unfilled1">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:Polygon_Unfilled</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Insert-Bezier_Unfilled1">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:Bezier_Unfilled</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Insert-ArrowsToolbox1">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:ArrowsToolbox</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="shapes4">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Insert-BasicShapes.rectangle1">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:BasicShapes.rectangle</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Insert-BasicShapes.ellipse1">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:BasicShapes.ellipse</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Insert-DrawCaption1">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:DrawCaption</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Insert-LineToolbox1">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:LineToolbox</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-3"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">11</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Insert-Section-Draw2">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator83">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="GroupB64">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="shapes6">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Insert-BasicShapes">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:BasicShapes</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Inser-SymbolShapes">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:SymbolShapes</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Inser-ArrowShapes">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:ArrowShapes</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Insert-ConnectorToolbox">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:ConnectorToolbox</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">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="shapes8">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Inser-StarShapes">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:StarShapes</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Inser-CalloutShapes">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:CalloutShapes</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Insert-FlowChartShapes">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:FlowChartShapes</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Inser-Objects3DToolbox">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:Objects3DToolbox</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">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-2"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">12</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Insert-Section-Symbol">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator34">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom105">
-                            <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</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Insert-CharmapControl">
-                                <property name="visible">True</property>
-                                <property name="action_name">.uno:CharmapControl</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">13</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Insert-Section-Symbol1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB27">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineA13">
-                                <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</property>
-                                <property name="show_arrow">False</property>
-                                <property name="icon_size">3</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Insert-InsertMath">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:InsertMath</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-1"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">14</property>
-                      </packing>
-                    </child>
                   </object>
                   <packing>
                     <property name="expand">True</property>
@@ -5757,28 +5030,28 @@
                 <child>
                   <object class="sfxlo-DropdownBox" id="Insert-Menu">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="halign">end</property>
                     <property name="valign">center</property>
                     <property name="vexpand">True</property>
                     <child>
                       <object class="GtkBox" id="GroupB18">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="valign">center</property>
                         <property name="vexpand">True</property>
                         <property name="orientation">vertical</property>
                         <child>
                           <object class="svtlo-ManagedMenuButton" id="Insert-InsertButton:Menu Insert">
-                            <property name="label" translatable="yes" context="impressnotebookbar|InsertMenuButton">_Insert</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|InsertMenuButton">_Insert</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="focus_on_click">False</property>
-                            <property name="receives_default">False</property>
+                            <property name="can-focus">True</property>
+                            <property name="focus-on-click">False</property>
+                            <property name="receives-default">False</property>
                             <property name="halign">end</property>
                             <property name="vexpand">True</property>
                             <property name="relief">none</property>
-                            <property name="use_underline">True</property>
+                            <property name="use-underline">True</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -5789,16 +5062,17 @@
                         <child>
                           <object class="sfxlo-NotebookbarToolBox" id="SectionBottom32">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                            <property name="can-focus">True</property>
                             <property name="halign">end</property>
                             <property name="hexpand">True</property>
-                            <property name="toolbar_style">icons</property>
-                            <property name="show_arrow">False</property>
+                            <property name="toolbar-style">icons</property>
+                            <property name="show-arrow">False</property>
                             <property name="icon_size">1</property>
                             <child>
                               <object class="GtkToolButton" id="Insert-InsertGraphic1">
                                 <property name="visible">True</property>
-                                <property name="action_name">.uno:InsertGraphic</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:InsertGraphic</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -5808,7 +5082,8 @@
                             <child>
                               <object class="GtkToolButton" id="Insert-Text1">
                                 <property name="visible">True</property>
-                                <property name="action_name">.uno:Text</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:Text</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -5818,7 +5093,8 @@
                             <child>
                               <object class="GtkToolButton" id="Insert-InsertPage1">
                                 <property name="visible">True</property>
-                                <property name="action_name">.uno:InsertSlide</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:InsertSlide</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -5843,27 +5119,10 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
-                    <property name="pack_type">end</property>
+                    <property name="pack-type">end</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
-                <child>
-                  <object class="GtkSeparator" id="separator22">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">end</property>
-                    <property name="margin_top">5</property>
-                    <property name="margin_bottom">5</property>
-                    <property name="orientation">vertical</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="padding">5</property>
-                    <property name="pack_type">end</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
               </object>
               <packing>
                 <property name="position">2</property>
@@ -5872,46 +5131,84 @@
             <child type="tab">
               <object class="GtkLabel" id="InsertLabel">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="impressnotebookbar|InsertLabel">~Insert</property>
-                <property name="use_underline">True</property>
+                <property name="can-focus">False</property>
+                <property name="label" translatable="yes" context="TabbedImpress|InsertTabLabel">~Insert</property>
+                <property name="use-underline">True</property>
               </object>
               <packing>
                 <property name="position">2</property>
-                <property name="tab_fill">False</property>
+                <property name="tab-fill">False</property>
               </packing>
             </child>
             <child>
-              <object class="sfxlo-PriorityHBox" id="Layout Tab">
+              <object class="sfxlo-PriorityHBox" id="Layout">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="valign">center</property>
                 <property name="vexpand">True</property>
                 <child>
-                  <object class="sfxlo-PriorityMergedHBox" id="Layout">
+                  <object class="sfxlo-PriorityMergedHBox" id="pmhbLayout">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="valign">center</property>
                     <property name="vexpand">True</property>
                     <child>
-                      <object class="VclOptionalBox" id="Slide-Section-PageFormat">
+                      <!-- n-columns=2 n-rows=3 -->
+                      <object class="GtkGrid" id="gdLayoutFormat">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">6</property>
+                        <property name="margin-end">3</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
                         <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom33">
+                          <object class="GtkLabel" id="lbLayoutFormat">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">end</property>
+                            <property name="vexpand">True</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|labelLayoutFormat">Format</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gdLayoutFormat"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxLayoutFormat">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
+                            <property name="toolbar-style">both</property>
+                            <property name="show-arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="Slide-PageSetup">
+                              <object class="GtkToolButton" id="btnLayoutSlideSetup">
                                 <property name="visible">True</property>
-                                <property name="action_name">.uno:SlideSetup</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:SlideSetup</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -5919,9 +5216,10 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkToolButton" id="Slide-HeaderAndFooter">
+                              <object class="GtkToolButton" id="btnLayoutHeaderAndFooter">
                                 <property name="visible">True</property>
-                                <property name="action_name">.uno:HeaderAndFooter</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:HeaderAndFooter</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -5930,11 +5228,14 @@
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">2</property>
                           </packing>
                         </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbLayoutFormat"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -5943,74 +5244,172 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="VclOptionalBox" id="Slide-Section-PageFormat1">
+                      <!-- n-columns=4 n-rows=3 -->
+                      <object class="GtkGrid" id="gdLayoutSlide">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">3</property>
+                        <property name="margin-end">3</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
                         <child>
-                          <object class="GtkBox" id="GroupB28">
+                          <object class="GtkLabel" id="lbLayoutSlide1">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">end</property>
+                            <property name="vexpand">True</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|labelLayoutSlide">Slide</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gdLayoutSlide"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                            <property name="width">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
                             <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">3</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxLayoutMoveSlideUp">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
                             <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineA12">
+                              <object class="GtkToolButton" id="btnLayoutMoveSlideUp">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Slide-SelectBackground">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:SelectBackground</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:MoveSlideUp</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineB13">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Slide-SaveBackground">
-                                    <property name="visible">True</property>
-                                    <property name="halign">start</property>
-                                    <property name="action_name">.uno:SaveBackground</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">True</property>
-                                <property name="position">1</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="left-attach">2</property>
+                            <property name="top-attach">0</property>
                           </packing>
                         </child>
-                        <style>
-                          <class name="priority-6"/>
-                        </style>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxLayoutMoveSlideDown">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnLayoutMoveSlideDown">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="halign">start</property>
+                                <property name="action-name">.uno:MoveSlideDown</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">False</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">2</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxLayoutHideSlide">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnLayoutHideSlide">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:HideSlide</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxLayoutShowSlide">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnLayoutShowSlide">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:ShowSlide</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxRenameSlide">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">center</property>
+                            <property name="vexpand">True</property>
+                            <property name="toolbar-style">both</property>
+                            <property name="show-arrow">False</property>
+                            <property name="icon_size">3</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnLayoutRenameSlide">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:RenameSlide</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">2</property>
+                          </packing>
+                        </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbLayoutSlide1"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -6019,39 +5418,63 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="VclOptionalBox" id="Slide-Section-ShowPage">
+                      <!-- n-columns=3 n-rows=3 -->
+                      <object class="GtkGrid" id="gdLayoutMaster">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">3</property>
+                        <property name="margin-end">3</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
                         <child>
-                          <object class="GtkSeparator" id="separator75">
+                          <object class="GtkLabel" id="lbLayoutMaster">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">end</property>
+                            <property name="vexpand">True</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|labelLayoutMaster">Master</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gdLayoutMaster"/>
+                            </accessibility>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                            <property name="width">2</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom14">
+                          <object class="GtkSeparator">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">2</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxLayoutPresentationLayout">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
+                            <property name="toolbar-style">both</property>
+                            <property name="show-arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="Slide-RenamePage">
+                              <object class="GtkToolButton" id="btnLayoutPresentationLayout">
                                 <property name="visible">True</property>
-                                <property name="action_name">.uno:RenameSlide</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:PresentationLayout</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -6060,218 +5483,22 @@
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">4</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Slide-Section-ShowPage1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB33">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineA23">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Slide-HideSlide">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:HideSlide</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineB25">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Slide-ShowSlide">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:ShowSlide</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-4"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">5</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Slide-Section-Navigation">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator56">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">2</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkBox" id="GroupB44">
+                          <object class="sfxlo-NotebookbarToolBox" id="bxLayoutDisplayMasterBackground">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
                             <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineA21">
+                              <object class="GtkToolButton" id="btnLayoutDisplayMasterBackground">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Slide-MovePageUp">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:MoveSlideUp</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineB23">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Slide-MovePageDown">
-                                    <property name="visible">True</property>
-                                    <property name="halign">start</property>
-                                    <property name="action_name">.uno:MoveSlideDown</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">False</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-3"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">6</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Slide-Section-MasterSlide">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator73">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom45">
-                            <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</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Slide-PresentationLayout">
-                                <property name="visible">True</property>
-                                <property name="action_name">.uno:PresentationLayout</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:DisplayMasterBackground</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -6280,127 +5507,21 @@
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">7</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Slide-Section-MasterSlide1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB57">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineA26">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Slide-DisplayMasterBackground">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:DisplayMasterBackground</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineB28">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Slide-DisplayMasterObjects">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:DisplayMasterObjects</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-2"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">9</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Slide-Section-Arrange">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator4">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom7">
+                          <object class="sfxlo-NotebookbarToolBox" id="bxLayoutDisplayMasterObjects">
                             <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</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
                             <child>
-                              <object class="GtkToolButton" id="Slide-ToggleObjectRotateMode">
+                              <object class="GtkToolButton" id="btnLayoutDisplayMasterObjects">
                                 <property name="visible">True</property>
-                                <property name="action_name">.uno:ToggleObjectRotateMode</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:DisplayMasterObjects</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -6409,91 +5530,145 @@
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">1</property>
                           </packing>
                         </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbLayoutMaster"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">11</property>
+                        <property name="position">2</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="VclOptionalBox" id="Slide-Section-Arrange1">
+                      <!-- n-columns=3 n-rows=3 -->
+                      <object class="GtkGrid" id="gdLayoutBackground">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">3</property>
+                        <property name="margin-end">6</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
                         <child>
-                          <object class="GtkBox" id="GroupB17">
+                          <object class="GtkLabel" id="lbLayoutBackground">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">end</property>
+                            <property name="vexpand">True</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|labelLayoutBackground">Background</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gdLayoutBackground"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                            <property name="width">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
                             <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">2</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxLayoutToggleObjectRotateMode">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">center</property>
+                            <property name="vexpand">True</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="LineA15">
+                              <object class="GtkToolButton" id="btnLayoutToggleObjectRotateMode">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Slide-ObjectAlign">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:ObjectAlign</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:ToggleObjectRotateMode</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineB16">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Slide-ObjectPosition">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:ObjectPosition</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</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="left-attach">0</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">2</property>
                           </packing>
                         </child>
-                        <style>
-                          <class name="priority-1"/>
-                        </style>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxLayoutObjectAlign">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnLayoutObjectAlign">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:ObjectAlign</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxLayoutObjectPosition">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnLayoutObjectPosition">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:ObjectPosition</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbLayoutBackground"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">12</property>
+                        <property name="position">3</property>
                       </packing>
                     </child>
                   </object>
@@ -6506,29 +5681,29 @@
                 <child>
                   <object class="sfxlo-DropdownBox" id="Layout-Menu">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="halign">end</property>
                     <property name="valign">center</property>
                     <property name="vexpand">True</property>
                     <child>
                       <object class="GtkBox" id="GroupB24">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="valign">center</property>
                         <property name="vexpand">True</property>
                         <property name="orientation">vertical</property>
                         <child>
                           <object class="svtlo-ManagedMenuButton" id="Slide-SlideButton:Menu Slide">
-                            <property name="label" translatable="yes" context="impressnotebookbar|SlideMenuButton">_Layout</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|LayoutMenuButton">_Layout</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="focus_on_click">False</property>
-                            <property name="receives_default">False</property>
+                            <property name="can-focus">True</property>
+                            <property name="focus-on-click">False</property>
+                            <property name="receives-default">False</property>
                             <property name="halign">end</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
                             <property name="relief">none</property>
-                            <property name="use_underline">True</property>
+                            <property name="use-underline">True</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -6539,17 +5714,18 @@
                         <child>
                           <object class="sfxlo-NotebookbarToolBox" id="SectionBottom15">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                            <property name="can-focus">True</property>
                             <property name="halign">end</property>
                             <property name="hexpand">True</property>
-                            <property name="toolbar_style">both-horiz</property>
-                            <property name="show_arrow">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
                             <property name="icon_size">1</property>
                             <child>
                               <object class="GtkToolButton" id="Slide-AssignLayout">
                                 <property name="visible">True</property>
+                                <property name="can-focus">False</property>
                                 <property name="valign">center</property>
-                                <property name="action_name">.uno:AssignLayout</property>
+                                <property name="action-name">.uno:AssignLayout</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -6574,24 +5750,24 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
-                    <property name="pack_type">end</property>
+                    <property name="pack-type">end</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkSeparator" id="separator18">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="halign">end</property>
-                    <property name="margin_top">5</property>
-                    <property name="margin_bottom">5</property>
+                    <property name="margin-top">5</property>
+                    <property name="margin-bottom">5</property>
                     <property name="orientation">vertical</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">True</property>
                     <property name="padding">5</property>
-                    <property name="pack_type">end</property>
+                    <property name="pack-type">end</property>
                     <property name="position">2</property>
                   </packing>
                 </child>
@@ -6603,49 +5779,104 @@
             <child type="tab">
               <object class="GtkLabel" id="LayoutLabel">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="impressnotebookbar|LayoutLabel">~Layout</property>
-                <property name="use_underline">True</property>
+                <property name="can-focus">False</property>
+                <property name="label" translatable="yes" context="TabbedImpress|LayoutTabLabel">~Layout</property>
+                <property name="use-underline">True</property>
               </object>
               <packing>
                 <property name="position">3</property>
-                <property name="tab_fill">False</property>
+                <property name="tab-fill">False</property>
               </packing>
             </child>
             <child>
-              <object class="sfxlo-PriorityHBox" id="Design_Tab">
+              <object class="sfxlo-PriorityHBox" id="Design">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
                 <child>
-                  <object class="sfxlo-PriorityMergedHBox" id="Design">
+                  <object class="sfxlo-PriorityMergedHBox" id="pmhbDesign">
                     <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="theme_colors_pane">
+                      <!-- n-columns=2 n-rows=3 -->
+                      <object class="GtkGrid" id="gdDesignTheme">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
-                        <property name="margin-start">5</property>
+                        <property name="margin-start">6</property>
+                        <property name="margin-end">6</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
                         <child>
-                          <object class="GtkToolButton" id="Theme-ThemeColorsPane">
+                          <object class="GtkLabel" id="lbDesignTheme">
                             <property name="visible">True</property>
                             <property name="can-focus">False</property>
-                            <property name="action-name">.uno:ThemeSelectorPanel</property>
-                            <property name="use-underline">True</property>
+                            <property name="valign">end</property>
+                            <property name="vexpand">True</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|labelDesignTheme">Color Theme</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gdDesignTheme"/>
+                            </accessibility>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="homogeneous">True</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
                           </packing>
                         </child>
+                        <child>
+                          <object class="GtkSeparator">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxDesignThemeColorsPanel">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnDesignThemeColorsPanel">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:ThemeSelectorPanel</property>
+                                <property name="use-underline">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">2</property>
+                          </packing>
+                        </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbDesignTheme"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">5</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
+                    <child>
+                      <placeholder/>
+                    </child>
                   </object>
                   <packing>
                     <property name="expand">True</property>
@@ -6662,7 +5893,7 @@
               <object class="GtkLabel" id="DesignLabel">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="label" translatable="yes" context="impressnotebookbar|DesignLabel">~Design</property>
+                <property name="label" translatable="yes" context="TabbedImpress|DesignTabLabel">~Design</property>
                 <property name="use-underline">True</property>
               </object>
               <packing>
@@ -6671,34 +5902,85 @@
               </packing>
             </child>
             <child>
-              <object class="sfxlo-PriorityHBox" id="Slide Show Tab">
+              <object class="sfxlo-PriorityHBox" id="SlideShow">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <child>
-                  <object class="sfxlo-PriorityMergedHBox" id="Slide Show">
+                  <object class="sfxlo-PriorityMergedHBox" id="pmhbSlideShow">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="valign">center</property>
                     <property name="vexpand">True</property>
                     <child>
-                      <object class="VclOptionalBox" id="Slideshow-Section-Slideshow">
+                      <!-- n-columns=3 n-rows=3 -->
+                      <object class="GtkGrid" id="gdShowSlide">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">6</property>
+                        <property name="margin-end">3</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
                         <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom89">
+                          <object class="GtkLabel" id="lbShowSlide">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">end</property>
+                            <property name="vexpand">True</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|labelSlideShowSlide">Slide Show</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gdShowSlide"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                            <property name="width">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">2</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxShowPresentation">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
+                            <property name="toolbar-style">both</property>
+                            <property name="show-arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="SlideShow-Presentation">
+                              <object class="GtkToolButton" id="btnShowPresentation">
                                 <property name="visible">True</property>
-                                <property name="action_name">.uno:Presentation</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:Presentation</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnShowPresentationCurrentSlide">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:PresentationCurrentSlide</property>
+                                <property name="use-underline">True</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -6707,168 +5989,22 @@
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Slideshow-Section-Slideshow1">
-                        <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="SectionBottom81">
-                            <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</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="SlideShow-PresentationCurrentSlide">
-                                <property name="visible">True</property>
-                                <property name="action_name">.uno:PresentationCurrentSlide</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Slideshow-Section-Slideshow2">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB34">
-                            <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>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineA16">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="SlideShow-RehearseTimings">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:RehearseTimings</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">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineB17">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="SlideShow-CustomShowDialog">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:CustomShowDialog</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">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-3"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Slideshow-Section-Page">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator16">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">2</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom11">
+                          <object class="sfxlo-NotebookbarToolBox" id="bxShowRehearseTimings">
                             <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</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
                             <child>
-                              <object class="GtkToolButton" id="SlideShow-PresentationDialog">
+                              <object class="GtkToolButton" id="btnShowRehearseTimings">
                                 <property name="visible">True</property>
-                                <property name="valign">center</property>
-                                <property name="action_name">.uno:PresentationDialog</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:RehearseTimings</property>
                               </object>
                               <packing>
                                 <property name="expand">True</property>
@@ -6877,132 +6013,128 @@
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
                           </packing>
                         </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">3</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Slideshow-Section-Page1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
                         <child>
-                          <object class="GtkBox" id="GroupB21">
+                          <object class="sfxlo-NotebookbarToolBox" id="bxShowCustomShowDialog">
                             <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="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
                             <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin1">
+                              <object class="GtkToolButton" id="btnShowCustomShowDialog">
                                 <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="SlideShow-SlideChangeWindow">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:SlideChangeWindow</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:CustomShowDialog</property>
                               </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="belowspacing5">
-                                <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="SlideShow-CustomAnimation">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:CustomAnimation</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</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>
+                                <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="left-attach">1</property>
+                            <property name="top-attach">1</property>
                           </packing>
                         </child>
-                        <style>
-                          <class name="priority-2"/>
-                        </style>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbShowSlide"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">4</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="VclOptionalBox" id="Slideshow-Section-Minimize">
+                      <!-- n-columns=3 n-rows=3 -->
+                      <object class="GtkGrid" id="gdShowSettings">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">3</property>
+                        <property name="margin-end">3</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
                         <child>
-                          <object class="GtkSeparator" id="separator14">
+                          <object class="GtkLabel" id="lbShowSettings">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">end</property>
+                            <property name="vexpand">True</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|labelSlideShowSettings">Settings</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gdShowSettings"/>
+                            </accessibility>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                            <property name="width">2</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom19">
+                          <object class="GtkSeparator">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">2</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxShowPresentationDialog">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
+                            <property name="toolbar-style">both</property>
+                            <property name="show-arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="SlideShow-PresentationMinimizer">
+                              <object class="GtkToolButton" id="btnShowPresentationDialog">
                                 <property name="visible">True</property>
-                                <property name="action_name">.uno:PresentationMinimizer</property>
+                                <property name="can-focus">False</property>
+                                <property name="valign">center</property>
+                                <property name="action-name">.uno:PresentationDialog</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxShowSlideChangeWindow">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</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="btnShowSlideChangeWindow">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:SlideChangeWindow</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -7011,96 +6143,174 @@
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
                           </packing>
                         </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">5</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Slideshow-Section-Minimize1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
                         <child>
-                          <object class="GtkBox" id="GroupB36">
+                          <object class="sfxlo-NotebookbarToolBox" id="bxShowCustomAnimation">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</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-horiz</property>
+                            <property name="show-arrow">False</property>
                             <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin3">
+                              <object class="GtkToolButton" id="btnShowCustomAnimation">
                                 <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="SlideShow-OutputQualityColor">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:OutputQualityColor</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:CustomAnimation</property>
                               </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="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">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="SlideShow-OutputQualityGrayscale">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:OutputQualityGrayscale</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</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>
+                                <property name="homogeneous">True</property>
                               </packing>
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">1</property>
                           </packing>
                         </child>
-                        <style>
-                          <class name="priority-1"/>
-                        </style>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbShowSettings"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">6</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <!-- n-columns=3 n-rows=3 -->
+                      <object class="GtkGrid" id="gdShowOptions">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">3</property>
+                        <property name="margin-end">6</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
+                        <child>
+                          <object class="GtkLabel" id="lbShowOptions">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">end</property>
+                            <property name="vexpand">True</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|labelSlideShowOptions">Options</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gdShowOptions"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                            <property name="width">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">2</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxShowPresentationMinimizer">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">center</property>
+                            <property name="vexpand">True</property>
+                            <property name="toolbar-style">both</property>
+                            <property name="show-arrow">False</property>
+                            <property name="icon_size">3</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnShowPresentationMinimizer">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:PresentationMinimizer</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxShowOutputQualityColor">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</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="btnShowOutputQualityColor">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:OutputQualityColor</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxShowOutputQualityGrayscale">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</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="btnShowOutputQualityGrayscale">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:OutputQualityGrayscale</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbShowOptions"/>
+                        </accessibility>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">2</property>
                       </packing>
                     </child>
                   </object>
@@ -7113,28 +6323,28 @@
                 <child>
                   <object class="sfxlo-DropdownBox" id="Slideshow-Menu">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="halign">end</property>
                     <property name="valign">center</property>
                     <property name="vexpand">True</property>
                     <child>
                       <object class="GtkBox" id="GroupB29">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="valign">center</property>
                         <property name="vexpand">True</property>
                         <property name="orientation">vertical</property>
                         <child>
                           <object class="svtlo-ManagedMenuButton" id="SlideShow-SlideShowButton:Menu Slide Show">
-                            <property name="label" translatable="yes" context="impressnotebookbar|SlideShowMenuButton">_Slide Show</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|SlideMenuButton">_Slide Show</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="focus_on_click">False</property>
-                            <property name="receives_default">False</property>
+                            <property name="can-focus">True</property>
+                            <property name="focus-on-click">False</property>
+                            <property name="receives-default">False</property>
                             <property name="halign">end</property>
                             <property name="hexpand">True</property>
                             <property name="relief">none</property>
-                            <property name="use_underline">True</property>
+                            <property name="use-underline">True</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -7145,17 +6355,18 @@
                         <child>
                           <object class="sfxlo-NotebookbarToolBox" id="SectionBottom8">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                            <property name="can-focus">True</property>
                             <property name="halign">end</property>
                             <property name="hexpand">True</property>
-                            <property name="toolbar_style">both-horiz</property>
-                            <property name="show_arrow">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
                             <property name="icon_size">1</property>
                             <child>
                               <object class="GtkToolButton" id="SlideShowMenu-Presentation">
                                 <property name="visible">True</property>
+                                <property name="can-focus">False</property>
                                 <property name="valign">center</property>
-                                <property name="action_name">.uno:Presentation</property>
+                                <property name="action-name">.uno:Presentation</property>
                               </object>
                               <packing>
                                 <property name="expand">True</property>
@@ -7180,27 +6391,10 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
-                    <property name="pack_type">end</property>
+                    <property name="pack-type">end</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
-                <child>
-                  <object class="GtkSeparator" id="separator29">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">end</property>
-                    <property name="margin_top">5</property>
-                    <property name="margin_bottom">5</property>
-                    <property name="orientation">vertical</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="padding">5</property>
-                    <property name="pack_type">end</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
               </object>
               <packing>
                 <property name="position">5</property>
@@ -7209,44 +6403,81 @@
             <child type="tab">
               <object class="GtkLabel" id="SlideShowLabel">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="impressnotebookbar|ReferencesLabel">~Slide Show</property>
-                <property name="use_underline">True</property>
+                <property name="can-focus">False</property>
+                <property name="label" translatable="yes" context="TabbedImpress|SlideTabLabel">~Slide Show</property>
+                <property name="use-underline">True</property>
               </object>
               <packing>
                 <property name="position">5</property>
-                <property name="tab_fill">False</property>
+                <property name="tab-fill">False</property>
               </packing>
             </child>
             <child>
-              <object class="sfxlo-PriorityHBox" id="Review Tab">
+              <object class="sfxlo-PriorityHBox" id="Review">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <child>
-                  <object class="sfxlo-PriorityMergedHBox" id="Review">
+                  <object class="sfxlo-PriorityMergedHBox" id="pmhbReview">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="valign">center</property>
                     <property name="vexpand">True</property>
                     <child>
-                      <object class="VclOptionalBox" id="Review-Section-Language">
+                      <!-- n-columns=3 n-rows=3 -->
+                      <object class="GtkGrid" id="gdReviewSpelling">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">6</property>
+                        <property name="margin-end">3</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
                         <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom67">
+                          <object class="GtkLabel" id="lbReviewSpelling">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|labelReviewSpelling">Spelling</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gdReviewSpelling"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                            <property name="width">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">2</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxReviewSpelling">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
+                            <property name="toolbar-style">both</property>
+                            <property name="show-arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="Review-SpellDialog">
+                              <object class="GtkToolButton" id="btnReviewSpellDialog">
                                 <property name="visible">True</property>
-                                <property name="action_name">.uno:SpellDialog</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:SpellDialog</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -7254,9 +6485,10 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkToolButton" id="Review-ThesaurusDialog">
+                              <object class="GtkToolButton" id="btnReviewThesaurusDialog">
                                 <property name="visible">True</property>
-                                <property name="action_name">.uno:ThesaurusDialog</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:ThesaurusDialog</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -7265,128 +6497,22 @@
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Review-Section-Language1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB40">
-                            <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>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineA19">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Review-SpellOnline">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:SpellOnline</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">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineB20">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Review-Hyphenation">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:Hyphenation</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">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-6"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Review-Section-Annotation">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator20">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">2</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom69">
+                          <object class="sfxlo-NotebookbarToolBox" id="bxReviewSpellOnline">
                             <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</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
                             <child>
-                              <object class="GtkToolButton" id="Review-InsertAnnotation">
+                              <object class="GtkToolButton" id="btnReviewSpellOnline">
                                 <property name="visible">True</property>
-                                <property name="action_name">.uno:InsertAnnotation</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:SpellOnline</property>
                               </object>
                               <packing>
                                 <property name="expand">True</property>
@@ -7395,11 +6521,348 @@
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
                           </packing>
                         </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxReviewHyphenation">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnReviewHyphenation">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:Hyphenation</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbReviewSpelling"/>
+                        </accessibility>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <!-- n-columns=5 n-rows=3 -->
+                      <object class="GtkGrid" id="gdReviewComments">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">3</property>
+                        <property name="margin-end">3</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
+                        <child>
+                          <object class="GtkLabel" id="lbReviewComments">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|labelReviewComments">Comments</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gdReviewComments"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                            <property name="width">4</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">4</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxReviewAnnotation">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">center</property>
+                            <property name="vexpand">True</property>
+                            <property name="toolbar-style">both</property>
+                            <property name="show-arrow">False</property>
+                            <property name="icon_size">3</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnReviewInsertAnnotation">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:InsertAnnotation</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxReviewNextAnnotation">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</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="btnReviewNextAnnotation">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:NextAnnotation</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxReviewDeleteAnnotation">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</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="btnReviewDeleteAnnotation">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:DeleteAnnotation</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">2</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxReviewPreviousAnnotation">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</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="btnReviewPreviousAnnotation">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:PreviousAnnotation</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxReviewDeleteAllAnnotation">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</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="btnReviewDeleteAllAnnotation">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:DeleteAllAnnotation</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">2</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxReviewShowAnnotations">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">center</property>
+                            <property name="vexpand">True</property>
+                            <property name="toolbar-style">both</property>
+                            <property name="show-arrow">False</property>
+                            <property name="icon_size">3</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnReviewShowAnnotations">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:ShowAnnotations</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">3</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">2</property>
+                          </packing>
+                        </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbReviewComments"/>
+                        </accessibility>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <!-- n-columns=3 n-rows=3 -->
+                      <object class="GtkGrid" id="gdReviewRedact">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">3</property>
+                        <property name="margin-end">6</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
+                        <child>
+                          <object class="GtkLabel" id="lbReviewRedact">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|labelReviewRedact">Redact</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gdReviewRedact"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                            <property name="width">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">2</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxReviewRedactDoc">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">center</property>
+                            <property name="vexpand">True</property>
+                            <property name="toolbar-style">both</property>
+                            <property name="show-arrow">False</property>
+                            <property name="icon_size">3</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnReviewRedactDoc">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:RedactDoc</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxReviewEditDoc">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">center</property>
+                            <property name="vexpand">True</property>
+                            <property name="toolbar-style">both</property>
+                            <property name="show-arrow">False</property>
+                            <property name="icon_size">3</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnReviewEditDoc">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:EditDoc</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">2</property>
+                          </packing>
+                        </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbReviewRedact"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -7407,322 +6870,6 @@
                         <property name="position">2</property>
                       </packing>
                     </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Review-Section-Annotation1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB41">
-                            <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>
-                            <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="Review-NextAnnotation">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:NextAnnotation</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</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="Review-PreviousAnnotation">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:PreviousAnnotation</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</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>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-5"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">3</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Review-Section-Annotation2">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB42">
-                            <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>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="belowspacing14">
-                                <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="Review-DeleteAnnotions">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:DeleteAnnotation</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</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="LeftParaMargin13">
-                                <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="Review-DeleteAllAnnotation">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:DeleteAllAnnotation</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</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>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">3</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-4"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">4</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Review-Section-Annotation3">
-                        <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="SectionBottom94">
-                            <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</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Review-ShowAnnotations">
-                                <property name="visible">True</property>
-                                <property name="action_name">.uno:ShowAnnotations</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-3"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">5</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Review-Section-RedactDoc">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator77">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom133">
-                            <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</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Review-RedactDoc">
-                                <property name="visible">True</property>
-                                <property name="action_name">.uno:RedactDoc</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-2"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">6</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Review-Section-EditDoc">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator11">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom92">
-                            <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</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Review-EditDoc">
-                                <property name="visible">True</property>
-                                <property name="action_name">.uno:EditDoc</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-1"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">7</property>
-                      </packing>
-                    </child>
                   </object>
                   <packing>
                     <property name="expand">True</property>
@@ -7733,27 +6880,27 @@
                 <child>
                   <object class="sfxlo-DropdownBox" id="Reference-Menu">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="halign">end</property>
                     <property name="valign">center</property>
                     <property name="vexpand">True</property>
                     <child>
                       <object class="GtkBox" id="GroupB37">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="valign">center</property>
                         <property name="vexpand">True</property>
                         <property name="orientation">vertical</property>
                         <child>
                           <object class="svtlo-ManagedMenuButton" id="Review-ReviewButton:Menu Review">
-                            <property name="label" translatable="yes" context="impressnotebookbar|ReviewMenuButton">_Review</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|ReviewMenuButton">_Review</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="focus_on_click">False</property>
-                            <property name="receives_default">False</property>
+                            <property name="can-focus">True</property>
+                            <property name="focus-on-click">False</property>
+                            <property name="receives-default">False</property>
                             <property name="halign">end</property>
                             <property name="relief">none</property>
-                            <property name="use_underline">True</property>
+                            <property name="use-underline">True</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -7764,17 +6911,18 @@
                         <child>
                           <object class="sfxlo-NotebookbarToolBox" id="SectionBottom17">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                            <property name="can-focus">True</property>
                             <property name="halign">end</property>
                             <property name="hexpand">True</property>
-                            <property name="toolbar_style">both-horiz</property>
-                            <property name="show_arrow">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
                             <property name="icon_size">1</property>
                             <child>
                               <object class="GtkToolButton" id="Review-AcceptTrackedChanges">
                                 <property name="visible">True</property>
+                                <property name="can-focus">False</property>
                                 <property name="valign">center</property>
-                                <property name="action_name">.uno:InsertAnnotation</property>
+                                <property name="action-name">.uno:InsertAnnotation</property>
                               </object>
                               <packing>
                                 <property name="expand">True</property>
@@ -7799,27 +6947,10 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
-                    <property name="pack_type">end</property>
+                    <property name="pack-type">end</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
-                <child>
-                  <object class="GtkSeparator" id="separator96">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">end</property>
-                    <property name="margin_top">5</property>
-                    <property name="margin_bottom">5</property>
-                    <property name="orientation">vertical</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="padding">5</property>
-                    <property name="pack_type">end</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
               </object>
               <packing>
                 <property name="position">6</property>
@@ -7828,44 +6959,93 @@
             <child type="tab">
               <object class="GtkLabel" id="ReviewLabel">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="impressnotebookbar|ReviewLabel">~Review</property>
-                <property name="use_underline">True</property>
+                <property name="can-focus">False</property>
+                <property name="label" translatable="yes" context="TabbedImpress|ReviewTabLabel">~Review</property>
+                <property name="use-underline">True</property>
               </object>
               <packing>
                 <property name="position">6</property>
-                <property name="tab_fill">False</property>
+                <property name="tab-fill">False</property>
               </packing>
             </child>
             <child>
-              <object class="sfxlo-PriorityHBox" id="View Tab">
+              <object class="sfxlo-PriorityHBox" id="View">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <child>
-                  <object class="sfxlo-PriorityMergedHBox" id="View">
+                  <object class="sfxlo-PriorityMergedHBox" id="pmhbView">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="valign">center</property>
                     <property name="vexpand">True</property>
                     <child>
-                      <object class="VclOptionalBox" id="View-Section-View">
+                      <!-- n-columns=3 n-rows=3 -->
+                      <object class="GtkGrid" id="gdViewMode">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">6</property>
+                        <property name="margin-end">3</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
                         <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom21">
+                          <object class="GtkLabel" id="lbViewMode">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|labelViewMode">View Mode</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gdViewMode"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                            <property name="width">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">2</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxViewMode">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
+                            <property name="toolbar-style">both</property>
+                            <property name="show-arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="View-NormalMultiPaneGUI">
+                              <object class="GtkToolButton" id="btnViewNormalMultiPaneGUI">
                                 <property name="visible">True</property>
-                                <property name="action_name">.uno:NormalMultiPaneGUI</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:NormalMultiPaneGUI</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnViewDiaMode">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:DiaMode</property>
+                                <property name="use-underline">True</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -7874,11 +7054,64 @@
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">2</property>
                           </packing>
                         </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxViewNotesMode">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</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="btnViewNotesMode">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:NotesMode</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxViewOutlineMode">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</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="btnViewOutlineMode">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:OutlineMode</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbViewMode"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -7887,24 +7120,61 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="VclOptionalBox" id="View-Section-View1">
+                      <!-- n-columns=3 n-rows=3 -->
+                      <object class="GtkGrid" id="gdViewMaster">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">3</property>
+                        <property name="margin-end">3</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
                         <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom90">
+                          <object class="GtkLabel" id="lbViewMaster">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|labelViewMaster">Master</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gdViewMaster"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                            <property name="width">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">2</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxViewSlideMasterPage">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
+                            <property name="toolbar-style">both</property>
+                            <property name="show-arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="View-DiaMode">
+                              <object class="GtkToolButton" id="btnViewSlideMasterPage">
                                 <property name="visible">True</property>
-                                <property name="action_name">.uno:DiaMode</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:SlideMasterPage</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -7913,14 +7183,64 @@
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">2</property>
                           </packing>
                         </child>
-                        <style>
-                          <class name="priority-13"/>
-                        </style>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxViewNotesMasterPage">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</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="btnViewNotesMasterPage">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:NotesMasterPage</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxViewHandoutMode">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</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="btnViewHandoutMode">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:HandoutMode</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbViewMaster"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -7929,78 +7249,169 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="VclOptionalBox" id="View-Section-View2">
+                      <!-- n-columns=4 n-rows=3 -->
+                      <object class="GtkGrid" id="gdViewZoom">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">3</property>
+                        <property name="margin-end">3</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
                         <child>
-                          <object class="GtkBox" id="GroupB26">
+                          <object class="GtkLabel" id="lbViewZoom">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|labelViewZoom">Zoom</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gdViewZoom"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                            <property name="width">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">3</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxViewZoomMode">
+                            <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="LeftParaMargin5">
+                              <object class="GtkToolButton" id="btnViewZoomMode">
                                 <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-NotesMode">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:NotesMode</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:ZoomMode</property>
                               </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="belowspacing4">
-                                <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-OutlineMode">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:OutlineMode</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</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>
+                                <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="left-attach">0</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">2</property>
                           </packing>
                         </child>
-                        <style>
-                          <class name="priority-12"/>
-                        </style>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxViewZoomPageWidth">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnViewZoomPageWidth">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:ZoomPageWidth</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">2</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxViewZoomNext">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnViewZoomNext">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:ZoomNext</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">2</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxViewZoomPage">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnViewZoomPage">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:ZoomPage</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxViewZoomPrevious">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnViewZoomPrevious">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:ZoomPrevious</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbViewZoom"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -8009,39 +7420,61 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="VclOptionalBox" id="View-Section-Master">
+                      <!-- n-columns=5 n-rows=3 -->
+                      <object class="GtkGrid" id="gdViewOptions">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">3</property>
+                        <property name="margin-end">3</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
                         <child>
-                          <object class="GtkSeparator" id="separator26">
+                          <object class="GtkLabel" id="lbViewOptions">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
+                            <property name="can-focus">False</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|labelViewOptions">Options</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gdViewOptions"/>
+                            </accessibility>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                            <property name="width">4</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom22">
+                          <object class="GtkSeparator">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">4</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxViewSidebar">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
+                            <property name="toolbar-style">both</property>
+                            <property name="show-arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="View-SlideMasterPage">
+                              <object class="GtkToolButton" id="btnViewSidebar">
                                 <property name="visible">True</property>
-                                <property name="action_name">.uno:SlideMasterPage</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:Sidebar</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -8050,11 +7483,141 @@
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">2</property>
                           </packing>
                         </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxViewShowRuler">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</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="btnViewShowRuler">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:ShowRuler</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">False</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxViewLeftPaneImpress">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</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="btnViewLeftPaneImpress">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:LeftPaneImpress</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">False</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxViewMenubar">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</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="btnViewMenubar">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:Menubar</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">2</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxViewToggleTabBarVisibility">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</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="btnViewToggleTabBarVisibility">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:ToggleTabBarVisibility</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">False</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">2</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxViewDarkMode">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">center</property>
+                            <property name="vexpand">True</property>
+                            <property name="toolbar-style">both</property>
+                            <property name="show-arrow">False</property>
+                            <property name="icon_size">3</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnViewDarkMode">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:ChangeTheme</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">3</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">2</property>
+                          </packing>
+                        </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbViewOptions"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -8063,78 +7626,208 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="VclOptionalBox" id="View-Section-Master1">
+                      <!-- n-columns=4 n-rows=3 -->
+                      <object class="GtkGrid" id="gdViewGrid">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">3</property>
+                        <property name="margin-end">6</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
                         <child>
-                          <object class="GtkBox" id="GroupB46">
+                          <object class="GtkLabel" id="lbViewGrid">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|labelViewGrid">Grid</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gdViewGrid"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                            <property name="width">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
                             <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">3</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxViewSnapTop">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">icons</property>
+                            <property name="show-arrow">False</property>
                             <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin6">
+                              <object class="GtkToolButton" id="btnViewCapturePoint">
                                 <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-NotesMasterPage">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:NotesMasterPage</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:CapturePoint</property>
+                                <property name="use-underline">True</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">0</property>
+                                <property name="homogeneous">True</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="belowspacing6">
+                              <object class="GtkToolButton" id="btnViewHelplinesVisible">
                                 <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-HandoutMode">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:HandoutMode</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:HelplinesVisible</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">1</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnViewSnapPoints">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:SnapPoints</property>
+                                <property name="use-underline">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnViewSnapBorder">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:SnapBorder</property>
+                                <property name="use-underline">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</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="left-attach">1</property>
+                            <property name="top-attach">0</property>
                           </packing>
                         </child>
-                        <style>
-                          <class name="priority-11"/>
-                        </style>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxViewSnapBottom">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">icons</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnViewGridUse">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:GridUse</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnViewHelplinesUse">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:HelplinesUse</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnViewSnapFrame">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:SnapFrame</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxViewGridVisible">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">center</property>
+                            <property name="vexpand">True</property>
+                            <property name="toolbar-style">both</property>
+                            <property name="show-arrow">False</property>
+                            <property name="icon_size">3</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnViewGridVisible">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:GridVisible</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxViewHelplinesMove">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">center</property>
+                            <property name="vexpand">True</property>
+                            <property name="toolbar-style">both</property>
+                            <property name="show-arrow">False</property>
+                            <property name="icon_size">3</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnViewHelplinesMove">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:HelplinesMove</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">2</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">2</property>
+                          </packing>
+                        </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbViewGrid"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -8142,943 +7835,6 @@
                         <property name="position">4</property>
                       </packing>
                     </child>
-                    <child>
-                      <object class="VclOptionalBox" id="View-Section-Zoom">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator19">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom16">
-                            <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</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="View-ZoomMode">
-                                <property name="visible">True</property>
-                                <property name="action_name">.uno:ZoomMode</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">5</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="View-Section-Zoom1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB63">
-                            <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>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineA17">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="View-ZoomPrevious">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:ZoomPrevious</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineB18">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="View-ZoomPage1">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:ZoomPage</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-10"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">6</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="View-Section-Zoom2">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB76">
-                            <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>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineA22">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="View-ZoomNext">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:ZoomNext</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineB19">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="View-ZoomPageWidth1">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:ZoomPageWidth</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">3</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-9"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">7</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="View-Section-Visible">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator27">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom23">
-                            <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</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="View-Sidebar">
-                                <property name="visible">True</property>
-                                <property name="action_name">.uno:Sidebar</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">8</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="View-Section-Visible1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB47">
-                            <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>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin9">
-                                <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-ShowRuler">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:ShowRuler</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">False</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="belowspacing9">
-                                <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-GridVisible">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:GridVisible</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">False</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">3</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-8"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">9</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="View-Section-Visible2">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB48">
-                            <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>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin10">
-                                <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-Menubar">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:Menubar</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</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="belowspacing11">
-                                <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-ToggleTabBarVisibility">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:ToggleTabBarVisibility</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">False</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">3</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-7"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">10</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Home-Section-Arrange">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator8">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom3">
-                            <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</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Home-SelectObject">
-                                <property name="visible">True</property>
-                                <property name="action_name">.uno:SelectObject</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">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-6"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">11</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Home-Section-Arrange1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB100">
-                            <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>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineA29">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Home-GridVisible">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:GridVisible</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Home-HelplinesVisible">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:HelplinesVisible</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Home-HelplinesMove">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:HelplinesMove</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineB30">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Home-GridUse">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:GridUse</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Home-HelplinesUse">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:HelplinesUse</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Home-SnapFrame">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:SnapFrame</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-5"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">12</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Home-Section-Arrange2">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB101">
-                            <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>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineA30">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Home-CapturePoint">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:CapturePoint</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Home-GlueInsertPoint">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:GlueInsertPoint</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineB31">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Home-SnapPoints">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:SnapPoints</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Home-SnapBorder">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:SnapBorder</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-4"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">13</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="View-Section-DarkMode">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator-section-darkmode">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="Section-darkmode">
-                            <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</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="View-DarkMode">
-                                <property name="visible">False</property>
-                                <property name="action_name">.uno:ChangeTheme</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">14</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="View-Section-DisplayQuality">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator30">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom86">
-                            <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</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="View-OutputQualityColor">
-                                <property name="visible">True</property>
-                                <property name="action_name">.uno:OutputQualityColor</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-3"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">14</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="View-Section-DisplayQuality1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB80">
-                            <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>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin12">
-                                <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-OutputQualityGrayscale">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:OutputQualityGrayscale</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</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="belowspacing13">
-                                <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-OutputQualityBlackWhite">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:OutputQualityBlackWhite</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</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>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-2"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">15</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="View-Section-New">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator12">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom88">
-                            <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</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="View-NewWindow">
-                                <property name="visible">True</property>
-                                <property name="action_name">.uno:NewWindow</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">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-1"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">16</property>
-                      </packing>
-                    </child>
                   </object>
                   <packing>
                     <property name="expand">True</property>
@@ -9089,29 +7845,29 @@
                 <child>
                   <object class="sfxlo-DropdownBox" id="View-Menu">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="halign">end</property>
                     <property name="valign">center</property>
                     <property name="vexpand">True</property>
                     <child>
                       <object class="GtkBox" id="ViewMenu2">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="valign">center</property>
                         <property name="vexpand">True</property>
                         <property name="orientation">vertical</property>
                         <child>
                           <object class="svtlo-ManagedMenuButton" id="View-ViewButton:Menu View">
-                            <property name="label" translatable="yes" context="impressnotebookbar|ViewMenuButton">_View</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|ViewMenuButton">_View</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="focus_on_click">False</property>
-                            <property name="receives_default">False</property>
+                            <property name="can-focus">True</property>
+                            <property name="focus-on-click">False</property>
+                            <property name="receives-default">False</property>
                             <property name="halign">end</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
                             <property name="relief">none</property>
-                            <property name="use_underline">True</property>
+                            <property name="use-underline">True</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -9122,17 +7878,18 @@
                         <child>
                           <object class="sfxlo-NotebookbarToolBox" id="SectionBottom20">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                            <property name="can-focus">True</property>
                             <property name="halign">end</property>
                             <property name="hexpand">True</property>
-                            <property name="toolbar_style">both-horiz</property>
-                            <property name="show_arrow">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
                             <property name="icon_size">1</property>
                             <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>
+                                <property name="action-name">.uno:Zoom</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -9157,27 +7914,10 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
-                    <property name="pack_type">end</property>
+                    <property name="pack-type">end</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
-                <child>
-                  <object class="GtkSeparator" id="separator126">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">end</property>
-                    <property name="margin_top">5</property>
-                    <property name="margin_bottom">5</property>
-                    <property name="orientation">vertical</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="padding">5</property>
-                    <property name="pack_type">end</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
               </object>
               <packing>
                 <property name="position">7</property>
@@ -9186,59 +7926,155 @@
             <child type="tab">
               <object class="GtkLabel" id="ViewLabel">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="impressnotebookbar|ViewLabel">~View</property>
-                <property name="use_underline">True</property>
+                <property name="can-focus">False</property>
+                <property name="label" translatable="yes" context="TabbedImpress|ViewTabLabel">~View</property>
+                <property name="use-underline">True</property>
               </object>
               <packing>
                 <property name="position">7</property>
-                <property name="tab_fill">False</property>
+                <property name="tab-fill">False</property>
               </packing>
             </child>
             <child>
-              <object class="sfxlo-PriorityHBox" id="Table Tab">
+              <object class="sfxlo-PriorityHBox" id="Table">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <child>
-                  <object class="sfxlo-PriorityMergedHBox" id="Table">
+                  <object class="sfxlo-PriorityMergedHBox" id="pmhbTable">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="valign">center</property>
                     <property name="vexpand">True</property>
                     <child>
-                      <object class="VclOptionalBox" id="Table-Section-Layout">
+                      <!-- n-columns=3 n-rows=3 -->
+                      <object class="GtkGrid" id="gdTable">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">6</property>
+                        <property name="margin-end">3</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
                         <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom44">
+                          <object class="GtkLabel" id="lbTable">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|labelTableTable">Table</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gdTable"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                            <property name="width">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">2</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxTable">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
+                            <property name="toolbar-style">both</property>
+                            <property name="show-arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="Table-AnimationEffects">
+                              <object class="GtkToolButton" id="btnTableTransformDialog">
                                 <property name="visible">True</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <property name="action_name">.uno:AnimationEffects</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:TransformDialog</property>
+                                <property name="use-underline">True</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
-                                <property name="homogeneous">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnTableSelectTable">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:SelectTable</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
                               </packing>
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">2</property>
                           </packing>
                         </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxTableEntireColumn">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnTableEntireColumn">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:EntireColumn</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxTableEntireRow">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnTableEntireRow">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:EntireRow</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbTable"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -9247,110 +8083,208 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="VclOptionalBox" id="Table-Section-Layout1">
+                      <!-- n-columns=4 n-rows=3 -->
+                      <object class="GtkGrid" id="gdTableCells">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">3</property>
+                        <property name="margin-end">3</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
                         <child>
-                          <object class="GtkBox" id="GroupB30">
+                          <object class="GtkLabel" id="lbTableCells">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
+                            <property name="can-focus">False</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|labelTableCells">Cells</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gdTableCells"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                            <property name="width">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
                             <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">3</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxTableCells">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">center</property>
+                            <property name="vexpand">True</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="SectionBottom55">
+                              <object class="GtkToolButton" id="btnTableMergeCells">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Table-InsertColumnsBefore">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:InsertColumnsBefore</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Table-InsertColumnsAfter">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:InsertColumnsAfter</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Table-DeleteColumns">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:DeleteColumns</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
+                                <property name="can-focus">False</property>
+                                <property name="valign">center</property>
+                                <property name="vexpand">True</property>
+                                <property name="action-name">.uno:MergeCells</property>
                               </object>
                               <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
+                                <property name="expand">True</property>
+                                <property name="homogeneous">True</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom57">
+                              <object class="GtkToolButton" id="btnTableSplitCell">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Table-InsertRowsBefore">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:InsertRowsBefore</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Table-InsertRowsAfter">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:InsertRowsAfter</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Table-DeleteRows">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:DeleteRows</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:SplitCell</property>
+                                <property name="use-underline">True</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
+                                <property name="homogeneous">True</property>
                               </packing>
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">2</property>
                           </packing>
                         </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxTableColumns">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">icons</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnTableInsertColumnsBefore">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:InsertColumnsBefore</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnTableInsertColumnsAfter">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:InsertColumnsAfter</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnTableDeleteColumns">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:DeleteColumns</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxTableRows">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">icons</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnTableInsertRowsBefore">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:InsertRowsBefore</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnTableInsertRowsAfter">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:InsertRowsAfter</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnTableDeleteRows">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:DeleteRows</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxTableOptimizeTable">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">center</property>
+                            <property name="vexpand">True</property>
+                            <property name="toolbar-style">both</property>
+                            <property name="show-arrow">False</property>
+                            <property name="icon_size">3</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnTableOptimizeTable">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:OptimizeTable</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">2</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">2</property>
+                          </packing>
+                        </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbTableCells"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -9359,84 +8293,209 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="VclOptionalBox" id="Table-Section-FormatLineArea">
+                      <!-- n-columns=5 n-rows=3 -->
+                      <object class="GtkGrid" id="gdTableLayout">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">3</property>
+                        <property name="margin-end">6</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
                         <child>
-                          <object class="GtkSeparator" id="separator5">
+                          <object class="GtkLabel" id="lbTableLayout">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
+                            <property name="can-focus">False</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|labelTableLayout">Layout</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gdTableLayout"/>
+                            </accessibility>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">1</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                            <property name="width">4</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkBox" id="box19">
+                          <object class="GtkSeparator">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">4</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxTableTableDesign">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">center</property>
+                            <property name="vexpand">True</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="third5">
+                              <object class="GtkToolButton" id="btnTableTableDesign">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">text</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Table-BorderDialog">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:Line</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">False</property>
-                                  </packing>
-                                </child>
+                                <property name="can-focus">False</property>
+                                <property name="valign">center</property>
+                                <property name="vexpand">True</property>
+                                <property name="action-name">.uno:TableDesign</property>
                               </object>
                               <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="third6">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">text</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Table-FormatArea">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:FormatArea</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">False</property>
-                                  </packing>
-                                </child>
-                              </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="left-attach">0</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">2</property>
                           </packing>
                         </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxTableFormatArea">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">text</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnTableFormatArea">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:FormatArea</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">False</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxTableSetBorderStyle">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">icons</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkMenuToolButton" id="btnTableSetBorderStyle">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="valign">center</property>
+                                <property name="action-name">.uno:SetBorderStyle</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">False</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">2</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxTableFillStyle">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnTableFillStyle">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:FillStyle</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">2</property>
+                            <property name="top-attach">1</property>
+                            <property name="width">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxTableLine">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">text</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnTableLine">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:Line</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">False</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxTableLineStyle">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnTableLineStyle">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:LineStyle</property>
+                                <property name="use-underline">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnTableFrameLineColor">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:FrameLineColor</property>
+                                <property name="use-underline">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">3</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbTableLayout"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -9444,620 +8503,6 @@
                         <property name="position">2</property>
                       </packing>
                     </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Table-Section-FormatLineArea2">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="box9">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="GtkBox" id="box10">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="first10">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkMenuToolButton" id="Table-SetBorderStyle">
-                                        <property name="visible">True</property>
-                                        <property name="valign">center</property>
-                                        <property name="action_name">.uno:SetBorderStyle</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">False</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Table-LineStyle">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:LineStyle</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">True</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="SectionBottom35">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="toolbar_style">both-horiz</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="Table-FrameLineColor">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:FrameLineColor</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">True</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom36">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Table-FillStyle">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:FillStyle</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">3</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Table-Section-Merge">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator45">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom37">
-                            <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</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Table-MergeCells">
-                                <property name="visible">True</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <property name="action_name">.uno:MergeCells</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">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-7"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">4</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Table-Section-Merge1">
-                        <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="SectionBottom39">
-                            <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</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Table-SplitCell">
-                                <property name="visible">True</property>
-                                <property name="action_name">.uno:SplitCell</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</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>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-6"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">5</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Table-Section-Select">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator51">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom43">
-                            <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</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Table-SelectTable">
-                                <property name="visible">True</property>
-                                <property name="action_name">.uno:SelectTable</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-5"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">6</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Table-Section-Select1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB62">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom40">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Table-EntireColumn">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:EntireColumn</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">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom62">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Table-EntireRow">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:EntireRow</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">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-4"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">7</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Table-Section-Optimize">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator1">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom76">
-                            <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</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Table-OptimizeTable">
-                                <property name="visible">True</property>
-                                <property name="action_name">.uno:OptimizeTable</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-3"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">8</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Table-Section-Optimize1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB66">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom84">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Table-CellVertTop">
-                                    <property name="visible">True</property>
-                                    <property name="halign">center</property>
-                                    <property name="hexpand">True</property>
-                                    <property name="action_name">.uno:CellVertTop</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Table-CellVertCenter">
-                                    <property name="visible">True</property>
-                                    <property name="halign">center</property>
-                                    <property name="hexpand">True</property>
-                                    <property name="action_name">.uno:CellVertCenter</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Table-CellVertBottom">
-                                    <property name="visible">True</property>
-                                    <property name="halign">center</property>
-                                    <property name="hexpand">True</property>
-                                    <property name="action_name">.uno:CellVertBottom</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Table-ParaRightToLeft">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:ParaRightToLeft</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom85">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Table-LeftPara">
-                                    <property name="visible">True</property>
-                                    <property name="halign">center</property>
-                                    <property name="hexpand">True</property>
-                                    <property name="action_name">.uno:StartPara</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Table-CenterPara">
-                                    <property name="visible">True</property>
-                                    <property name="halign">center</property>
-                                    <property name="hexpand">True</property>
-                                    <property name="action_name">.uno:CenterPara</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Table-RightPara">
-                                    <property name="visible">True</property>
-                                    <property name="halign">center</property>
-                                    <property name="hexpand">True</property>
-                                    <property name="action_name">.uno:EndPara</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Table-JustifyPara">
-                                    <property name="visible">True</property>
-                                    <property name="halign">center</property>
-                                    <property name="hexpand">True</property>
-                                    <property name="action_name">.uno:JustifyPara</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-2"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">9</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Table-Section-Style">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator2">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom79">
-                            <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</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Table-TableDesign">
-                                <property name="visible">True</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <property name="action_name">.uno:TableDesign</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">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-1"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">10</property>
-                      </packing>
-                    </child>
                   </object>
                   <packing>
                     <property name="expand">True</property>
@@ -10068,28 +8513,28 @@
                 <child>
                   <object class="sfxlo-DropdownBox" id="Table-Menu">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="halign">end</property>
                     <property name="valign">center</property>
                     <property name="vexpand">True</property>
                     <child>
                       <object class="GtkBox" id="GroupB58">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="valign">center</property>
                         <property name="vexpand">True</property>
                         <property name="orientation">vertical</property>
                         <child>
                           <object class="svtlo-ManagedMenuButton" id="Table-TableButton:Menu Table">
-                            <property name="label" translatable="yes" context="impressnotebookbar|TableMenuButton">_Table</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|TableMenuButton">_Table</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="focus_on_click">False</property>
-                            <property name="receives_default">False</property>
+                            <property name="can-focus">True</property>
+                            <property name="focus-on-click">False</property>
+                            <property name="receives-default">False</property>
                             <property name="halign">end</property>
                             <property name="valign">center</property>
                             <property name="relief">none</property>
-                            <property name="use_underline">True</property>
+                            <property name="use-underline">True</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -10100,17 +8545,18 @@
                         <child>
                           <object class="sfxlo-NotebookbarToolBox" id="SectionBottom29">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                            <property name="can-focus">True</property>
                             <property name="halign">end</property>
                             <property name="hexpand">True</property>
-                            <property name="toolbar_style">both-horiz</property>
-                            <property name="show_arrow">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
                             <property name="icon_size">1</property>
                             <child>
                               <object class="GtkToolButton" id="Table-TableDialog">
                                 <property name="visible">True</property>
+                                <property name="can-focus">False</property>
                                 <property name="valign">center</property>
-                                <property name="action_name">.uno:TableDialog</property>
+                                <property name="action-name">.uno:TableDialog</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -10135,27 +8581,10 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
-                    <property name="pack_type">end</property>
+                    <property name="pack-type">end</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
-                <child>
-                  <object class="GtkSeparator" id="separator118">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">end</property>
-                    <property name="margin_top">5</property>
-                    <property name="margin_bottom">5</property>
-                    <property name="orientation">vertical</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="padding">5</property>
-                    <property name="pack_type">end</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
               </object>
               <packing>
                 <property name="position">8</property>
@@ -10164,49 +8593,156 @@
             <child type="tab">
               <object class="GtkLabel" id="TableLabel">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="impressnotebookbar|TableLabel">~Table</property>
-                <property name="use_underline">True</property>
+                <property name="can-focus">False</property>
+                <property name="label" translatable="yes" context="TabbedImpress|TableTabLabel">~Table</property>
+                <property name="use-underline">True</property>
                 <style>
                   <class name="context-Table"/>
                 </style>
               </object>
               <packing>
                 <property name="position">8</property>
-                <property name="tab_fill">False</property>
+                <property name="tab-fill">False</property>
               </packing>
             </child>
             <child>
-              <object class="sfxlo-PriorityHBox" id="Image Tab">
+              <object class="sfxlo-PriorityHBox" id="Image">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <child>
-                  <object class="sfxlo-PriorityMergedHBox" id="Image">
+                  <object class="sfxlo-PriorityMergedHBox" id="pmhbImage">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="valign">center</property>
                     <property name="vexpand">True</property>
                     <child>
-                      <object class="VclOptionalBox" id="Image-Section-Edit">
+                      <!-- n-columns=4 n-rows=3 -->
+                      <object class="GtkGrid" id="gdImage">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">6</property>
+                        <property name="margin-end">3</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
                         <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="Big">
+                          <object class="GtkLabel" id="lbImage">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">end</property>
                             <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|labeImageImage">Image</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gdImage"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                            <property name="width">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="halign">end</property>
+                            <property name="margin-top">5</property>
+                            <property name="margin-bottom">5</property>
+                            <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">3</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxImageCompressGraphic">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">icons</property>
+                            <property name="show-arrow">False</property>
                             <child>
-                              <object class="GtkToolButton" id="Image-AnimationEffects">
+                              <object class="GtkToolButton" id="btnImageCompressGraphic">
                                 <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:CompressGraphic</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxImageCrop">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnImageCrop">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:Crop</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">2</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxImageToggleRotate">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">icons</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnImageToggleObjectRotateMode">
+                                <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:AnimationEffects</property>
+                                <property name="action-name">.uno:ToggleObjectRotateMode</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnImageFlipVertical">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:FlipVertical</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnImageFlipHorizontal">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:FlipHorizontal</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -10215,11 +8751,43 @@
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">1</property>
+                            <property name="width">2</property>
                           </packing>
                         </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxImageTransformDialog">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">center</property>
+                            <property name="vexpand">True</property>
+                            <property name="toolbar-style">both</property>
+                            <property name="show-arrow">False</property>
+                            <property name="icon_size">3</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnImageTransformDialog">
+                                <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>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">False</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">2</property>
+                          </packing>
+                        </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbImage"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -10228,850 +8796,63 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="VclOptionalBox" id="Image-Section-Edit1">
+                      <!-- n-columns=4 n-rows=3 -->
+                      <object class="GtkGrid" id="gdImageFillBorder">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">3</property>
+                        <property name="margin-end">3</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
                         <child>
-                          <object class="GtkBox" id="SecondGroup">
+                          <object class="GtkLabel" id="lbImageFillBorder">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">end</property>
                             <property name="vexpand">True</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="GtkBox" id="box13">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="first11">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="Image-CompressGraphic1">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:CompressGraphic</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="first">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="toolbar_style">both-horiz</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="Image-Crop1">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:Crop</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="second3">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Image-ToggleObjectRotateMode">
-                                    <property name="visible">True</property>
-                                    <property name="valign">center</property>
-                                    <property name="vexpand">True</property>
-                                    <property name="action_name">.uno:ToggleObjectRotateMode</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">False</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Image-FlipVertical">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:FlipVertical</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">False</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Image-FlipHorizontal">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:FlipHorizontal</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">False</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Image-ChangePicture">
-                                    <property name="visible">True</property>
-                                    <property name="valign">center</property>
-                                    <property name="vexpand">True</property>
-                                    <property name="action_name">.uno:ChangePicture</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">False</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Image-SaveGraphic">
-                                    <property name="visible">True</property>
-                                    <property name="valign">center</property>
-                                    <property name="vexpand">True</property>
-                                    <property name="action_name">.uno:SaveGraphic</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">False</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
+                            <property name="label" translatable="yes" context="TabbedImpress|labelImageFillBorder">Fill &amp; Border</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gdImageFillBorder"/>
+                            </accessibility>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                            <property name="width">3</property>
                           </packing>
                         </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Image-Section-FormatLineArea">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
                         <child>
-                          <object class="GtkSeparator" id="separator60">
+                          <object class="GtkSeparator">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
+                            <property name="can-focus">False</property>
+                            <property name="halign">end</property>
+                            <property name="margin-top">5</property>
+                            <property name="margin-bottom">5</property>
                             <property name="orientation">vertical</property>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
+                            <property name="left-attach">3</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkBox" id="box3">
+                          <object class="sfxlo-NotebookbarToolBox" id="bxImageFormatArea">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="orientation">vertical</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">text</property>
+                            <property name="show-arrow">False</property>
                             <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="third1">
+                              <object class="GtkToolButton" id="btnImageFormatArea">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">text</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-FormatLine1">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:FormatLine</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">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="third2">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">text</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-FormatArea1">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:FormatArea</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">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Image-Section-FormatLineArea1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="box7">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="GtkBox" id="box20">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="first1">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkMenuToolButton" id="Draw-XLineStyle1">
-                                        <property name="width_request">100</property>
-                                        <property name="visible">True</property>
-                                        <property name="valign">center</property>
-                                        <property name="action_name">.uno:XLineStyle</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">False</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Draw-LineWidth1">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:LineWidth</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">True</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="SectionBottom18">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="Draw-LineEndStyle4">
-                                        <property name="action_name">.uno:LineEndStyle</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">True</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Draw-XLineColor1">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:XLineColor</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">True</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom135">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="hexpand">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-FillStyle4">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:FillStyle</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">3</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Image-Section-FormatLineArea3">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="box23">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="first27">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Image-LineEndStyle">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:LineEndStyle</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">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom134">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Image-FillShadow">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:FillShadow</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">3</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-7"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">4</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Image-Section-ObjectAlign">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator80">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="svtlo-ManagedMenuButton" id="Image-ConvertButton:Menu Convert">
-                            <property name="label" translatable="yes" context="impressnotebookbar|ConvertMenuButton">Convert</property>
-                            <property name="width_request">70</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                            <property name="action_name">.uno:ChangeBezier</property>
-                            <property name="image">changebezierImg</property>
-                            <property name="relief">none</property>
-                            <property name="use_underline">True</property>
-                            <property name="image_position">top</property>
-                            <property name="always_show_image">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="VclOptionalBox" id="Image-Section-ObjectAlign2">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <child>
-                              <object class="GtkBox" id="box11">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <child>
-                                  <object class="GtkBox" id="AlignGroup6">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="valign">center</property>
-                                    <property name="orientation">vertical</property>
-                                    <child>
-                                      <object class="sfxlo-NotebookbarToolBox" id="Align11">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="toolbar_style">icons</property>
-                                        <property name="show_arrow">False</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="sfxlo-NotebookbarToolBox" id="Align12">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="toolbar_style">icons</property>
-                                        <property name="show_arrow">False</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">1</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">2</property>
-                              </packing>
-                            </child>
-                            <style>
-                              <class name="priority-4"/>
-                            </style>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-6"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">5</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Image-Section-ObjectAlign1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="box5">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <child>
-                              <object class="GtkBox" id="AlignGroup3">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="valign">center</property>
-                                <property name="orientation">vertical</property>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="Align5">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="Image-ObjectAlignLeft">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:ObjectAlignLeft</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Image-AlignCenter">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:AlignCenter</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Image-ObjectAlignRight">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:ObjectAlignRight</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="Align6">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="Image-AlignUp">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:AlignUp</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Image-AlignMiddle">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:AlignMiddle</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Image-AlignDown">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:AlignDown</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-5"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">6</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Image-Section-Arrange">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator123">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <!-- n-columns=1 n-rows=1 -->
-                          <object class="GtkGrid" id="grid1">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="first3">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Image-BringToFront">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:BringToFront</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="second2">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Image-SendToBack">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:SendToBack</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="first7">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Image-Forward">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:Forward</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="Second7">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Image-Backward">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:Backward</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-4"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">7</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Image-Section-FormatImageFilter">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator79">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="GraphicFilterToolboxGroup">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <child>
-                              <object class="GtkMenuToolButton" id="Image-GraphicFilterToolbox">
-                                <property name="visible">True</property>
-                                <property name="action_name">.uno:GraphicFilterToolbox</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:FormatArea</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -11080,261 +8861,570 @@
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">1</property>
                           </packing>
                         </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxImageFillStyle">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnImageFillStyle">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:FillStyle</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">1</property>
+                            <property name="width">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxImageFormatLine">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">text</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnImageFormatLine">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:FormatLine</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">False</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxImageLineStyleLeft">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">icons</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkMenuToolButton" id="btnImageXLineStyle">
+                                <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>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnImageLineWidth">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:LineWidth</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxImageLineStyleRight">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">icons</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnImageLineEndStyle">
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:LineEndStyle</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnImageXLineColor">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:XLineColor</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnImageFillShadow">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:FillShadow</property>
+                                <property name="use-underline">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">2</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbImageFillBorder"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">8</property>
+                        <property name="position">1</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="VclOptionalBox" id="Image-Section-ColorSettings1">
+                      <!-- n-columns=2 n-rows=3 -->
+                      <object class="GtkGrid" id="gdImagePositioning">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">3</property>
+                        <property name="margin-end">3</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
                         <child>
-                          <object class="GtkBox" id="GroupB87">
+                          <object class="GtkLabel" id="lbImagePositioning">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">end</property>
+                            <property name="vexpand">True</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|labelImagePositioning">Positioning</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gdImagePositioning"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="halign">end</property>
+                            <property name="margin-top">5</property>
+                            <property name="margin-bottom">5</property>
                             <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxImageAlignTop">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">icons</property>
+                            <property name="show-arrow">False</property>
                             <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="colorbox3">
+                              <object class="GtkToolButton" id="btnImageObjectAlignLeft">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkMenuToolButton" id="Image-GrafLuminance">
-                                    <property name="width_request">130</property>
-                                    <property name="visible">True</property>
-                                    <property name="valign">center</property>
-                                    <property name="action_name">.uno:GrafLuminance</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">False</property>
-                                  </packing>
-                                </child>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:ObjectAlignLeft</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
+                                <property name="homogeneous">True</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="colorbox4">
+                              <object class="GtkToolButton" id="btnImageAlignCenter">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkMenuToolButton" id="Image-GrafContrast">
-                                    <property name="visible">True</property>
-                                    <property name="valign">center</property>
-                                    <property name="action_name">.uno:GrafContrast</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">False</property>
-                                  </packing>
-                                </child>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:AlignCenter</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnImageObjectAlignRight">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:ObjectAlignRight</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnImageBringToFront">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:BringToFront</property>
+                                <property name="use-underline">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnImageObjectForwardOne">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:ObjectForwardOne</property>
+                                <property name="use-underline">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
                               </packing>
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
                           </packing>
                         </child>
-                        <style>
-                          <class name="priority-3"/>
-                        </style>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxImageAlignBottom">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">icons</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnImageAlignUp">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:AlignUp</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnImageAlignMiddle">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:AlignMiddle</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnImageAlignDown">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:AlignDown</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnImageSendToBack">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:SendToBack</property>
+                                <property name="use-underline">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnImageObjectBackOne">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:ObjectBackOne</property>
+                                <property name="use-underline">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbImagePositioning"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="padding">5</property>
-                        <property name="position">9</property>
+                        <property name="position">2</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="VclOptionalBox" id="Image-Section-ColorSettings2">
+                      <!-- n-columns=5 n-rows=3 -->
+                      <object class="GtkGrid" id="gdImageModify">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">3</property>
+                        <property name="margin-end">6</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
                         <child>
-                          <object class="GtkBox" id="GroupB90">
+                          <object class="GtkLabel" id="lbImageModify">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">end</property>
+                            <property name="vexpand">True</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|labelImageModify">Modify</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gdImageModify"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                            <property name="width">4</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="halign">end</property>
+                            <property name="margin-top">5</property>
+                            <property name="margin-bottom">5</property>
                             <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">4</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxImageGraphicFilterToolbox">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">center</property>
+                            <property name="vexpand">True</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="colorbox5">
+                              <object class="GtkMenuToolButton" id="btnImageGraphicFilterToolbox">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkMenuToolButton" id="Image-GrafTransparence">
-                                    <property name="visible">True</property>
-                                    <property name="valign">center</property>
-                                    <property name="action_name">.uno:GrafTransparence</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">False</property>
-                                  </packing>
-                                </child>
+                                <property name="can-focus">False</property>
+                                <property name="valign">center</property>
+                                <property name="vexpand">True</property>
+                                <property name="action-name">.uno:GraphicFilterToolbox</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="colorbox6">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkMenuToolButton" id="Image-GrafGamma">
-                                    <property name="width_request">130</property>
-                                    <property name="visible">True</property>
-                                    <property name="valign">center</property>
-                                    <property name="action_name">.uno:GrafGamma</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">False</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
+                                <property name="homogeneous">False</property>
                               </packing>
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">2</property>
                           </packing>
                         </child>
-                        <style>
-                          <class name="priority-2"/>
-                        </style>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxImageGrafLuminance">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkMenuToolButton" id="btnImageGrafLuminance">
+                                <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:GrafLuminance</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">False</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxImageGrafContrast">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkMenuToolButton" id="btnImageGrafContrast">
+                                <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>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">False</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxImageGrafTransparence">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkMenuToolButton" id="btnImageGrafTransparence">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="valign">center</property>
+                                <property name="action-name">.uno:GrafTransparence</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">False</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">2</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxImageGrafGamma">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkMenuToolButton" id="btnImageGrafGamma">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="valign">center</property>
+                                <property name="action-name">.uno:GrafGamma</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">False</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">2</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxImageGrafMode">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnImageGrafMode">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:GrafMode</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">3</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxImageColorSettings">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnImageColorSettings">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:ColorSettings</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">3</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbImageModify"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">10</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Image-Section-GrafMode">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator97">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="GroupB103">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="colorbox1">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Graphic-GrafMode">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:GrafMode</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="colorbox2">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Graphic-ColorSettings">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:ColorSettings</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-1"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">11</property>
+                        <property name="position">3</property>
                       </packing>
                     </child>
                   </object>
@@ -11347,28 +9437,28 @@
                 <child>
                   <object class="sfxlo-DropdownBox" id="Image-Menu">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="halign">end</property>
                     <property name="valign">center</property>
                     <property name="vexpand">True</property>
                     <child>
                       <object class="GtkBox" id="GroupB67">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="valign">center</property>
                         <property name="vexpand">True</property>
                         <property name="orientation">vertical</property>
                         <child>
                           <object class="svtlo-ManagedMenuButton" id="Image-GraphicButton:Menu Image">
-                            <property name="label" translatable="yes" context="impressnotebookbar|GraphicMenuButton">Ima_ge</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|ImageMenuButton">Ima_ge</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="focus_on_click">False</property>
-                            <property name="receives_default">False</property>
+                            <property name="can-focus">True</property>
+                            <property name="focus-on-click">False</property>
+                            <property name="receives-default">False</property>
                             <property name="halign">end</property>
                             <property name="valign">center</property>
                             <property name="relief">none</property>
-                            <property name="use_underline">True</property>
+                            <property name="use-underline">True</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -11379,18 +9469,19 @@
                         <child>
                           <object class="sfxlo-NotebookbarToolBox" id="SectionBottom83">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                            <property name="can-focus">True</property>
                             <property name="halign">end</property>
                             <property name="hexpand">True</property>
-                            <property name="toolbar_style">icons</property>
-                            <property name="show_arrow">False</property>
+                            <property name="toolbar-style">icons</property>
+                            <property name="show-arrow">False</property>
                             <property name="icon_size">1</property>
                             <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>
+                                <property name="action-name">.uno:FormatArea</property>
                               </object>
                               <packing>
                                 <property name="expand">True</property>
@@ -11400,9 +9491,10 @@
                             <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>
+                                <property name="action-name">.uno:FormatLine</property>
                               </object>
                               <packing>
                                 <property name="expand">True</property>
@@ -11412,9 +9504,10 @@
                             <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>
+                                <property name="action-name">.uno:TransformDialog</property>
                               </object>
                               <packing>
                                 <property name="expand">True</property>
@@ -11439,27 +9532,10 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
-                    <property name="pack_type">end</property>
+                    <property name="pack-type">end</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
-                <child>
-                  <object class="GtkSeparator" id="separator59">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">end</property>
-                    <property name="margin_top">5</property>
-                    <property name="margin_bottom">5</property>
-                    <property name="orientation">vertical</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="padding">5</property>
-                    <property name="pack_type">end</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
               </object>
               <packing>
                 <property name="position">9</property>
@@ -11468,165 +9544,200 @@
             <child type="tab">
               <object class="GtkLabel" id="ImageLabel">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="impressnotebookbar|ImageLabel">Ima~ge</property>
-                <property name="use_underline">True</property>
+                <property name="can-focus">False</property>
+                <property name="label" translatable="yes" context="TabbedImpress|ImageTabLabel">Ima~ge</property>
+                <property name="use-underline">True</property>
                 <style>
                   <class name="context-Graphic"/>
                 </style>
               </object>
               <packing>
                 <property name="position">9</property>
-                <property name="tab_fill">False</property>
+                <property name="tab-fill">False</property>
               </packing>
             </child>
             <child>
-              <object class="sfxlo-PriorityHBox" id="Draw Tab">
+              <object class="sfxlo-PriorityHBox" id="Draw">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <child>
-                  <object class="sfxlo-PriorityMergedHBox" id="Draw">
+                  <object class="sfxlo-PriorityMergedHBox" id="pmhbDraw">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="valign">center</property>
                     <property name="vexpand">True</property>
                     <child>
-                      <object class="VclOptionalBox" id="Draw-Section-Edit">
+                      <!-- n-columns=3 n-rows=3 -->
+                      <object class="GtkGrid" id="gdDraw">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">6</property>
+                        <property name="margin-end">3</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
                         <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="Big1">
+                          <object class="GtkLabel" id="lbDraw">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">end</property>
+                            <property name="vexpand">True</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|labelDrawDraw">Drawing Object</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gdDraw"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                            <property name="width">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="halign">end</property>
+                            <property name="margin-top">5</property>
+                            <property name="margin-bottom">5</property>
+                            <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">2</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxDrawTransformDialog">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
+                            <property name="toolbar-style">both</property>
+                            <property name="show-arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="Draw-AnimationEffects">
+                              <object class="GtkToolButton" id="btnDrawTransformDialog">
                                 <property name="visible">True</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <property name="action_name">.uno:AnimationEffects</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:TransformDialog</property>
+                                <property name="use-underline">True</property>
                               </object>
                               <packing>
-                                <property name="expand">True</property>
+                                <property name="expand">False</property>
                                 <property name="homogeneous">True</property>
                               </packing>
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">2</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkBox" id="GroupB35">
+                          <object class="sfxlo-NotebookbarToolBox" id="bxDrawTop">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
+                            <property name="vexpand">True</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
                             <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom60">
+                              <object class="GtkToolButton" id="btnDrawToggleObjectBezierMode">
                                 <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="Draw-ToggleObjectBezierMode1">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:AdvancedMode</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:AdvancedMode</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom61">
-                                <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="Draw-ToggleObjectRotateMode">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:ToggleObjectRotateMode</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-FlipVertical">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:FlipVertical</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-FlipHorizontal">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:FlipHorizontal</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-Shear">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:Shear</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-CrookSlant">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:CrookSlant</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</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="left-attach">1</property>
+                            <property name="top-attach">0</property>
                           </packing>
                         </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxDrawBottom">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</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="btnDrawToggleObjectRotateMode">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:ToggleObjectRotateMode</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnDrawFlipVertical">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:FlipVertical</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnDrawFlipHorizontal">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:FlipHorizontal</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnDrawShear">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:Shear</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnDrawCrookSlant">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:CrookSlant</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbDraw"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -11635,84 +9746,207 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="VclOptionalBox" id="Draw-Section-FormatLineArea1">
+                      <!-- n-columns=4 n-rows=3 -->
+                      <object class="GtkGrid" id="gdDrawFillBorder">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">3</property>
+                        <property name="margin-end">3</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
                         <child>
-                          <object class="GtkSeparator" id="separator68">
+                          <object class="GtkLabel" id="lbDrawFillBorder">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">end</property>
+                            <property name="vexpand">True</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|labelDrawFillBorder">Fill &amp; Border</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gdDrawFillBorder"/>
+                            </accessibility>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                            <property name="width">3</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkBox" id="box59">
+                          <object class="GtkSeparator">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
+                            <property name="halign">end</property>
+                            <property name="margin-top">5</property>
+                            <property name="margin-bottom">5</property>
                             <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">3</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxDrawFormatArea">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">text</property>
+                            <property name="show-arrow">False</property>
                             <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="third10">
+                              <object class="GtkToolButton" id="btnDrawFormatArea">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">text</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-FormatLine2">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:FormatLine</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:FormatArea</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="third13">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">text</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-FormatArea2">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:FormatArea</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">True</property>
-                                <property name="position">1</property>
+                                <property name="homogeneous">False</property>
                               </packing>
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">1</property>
                           </packing>
                         </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxDrawFillStyle">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnDrawFillStyle">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:FillStyle</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">1</property>
+                            <property name="width">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxDrawFormatLine">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">text</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnDrawFormatLine">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:FormatLine</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">False</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxDrawLineStyleLeft">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">icons</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkMenuToolButton" id="btnDrawXLineStyle">
+                                <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>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnDrawLineWidth">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:LineWidth</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxDrawLineStyleRight">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">icons</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnDrawLineEndStyle">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:LineEndStyle</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnDrawXLineColor">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:XLineColor</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnDrawFillShadow">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:FillShadow</property>
+                                <property name="use-underline">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">2</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbDrawFillBorder"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -11721,125 +9955,192 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="VclOptionalBox" id="Draw-Section-FormatLineArea3">
+                      <!-- n-columns=2 n-rows=3 -->
+                      <object class="GtkGrid" id="gdDrawPositioning">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">3</property>
+                        <property name="margin-end">3</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
                         <child>
-                          <object class="GtkBox" id="box2">
+                          <object class="GtkLabel" id="lbDrawPositioning">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">end</property>
+                            <property name="vexpand">True</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|labelDrawPositioning">Positioning</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gdDrawPositioning"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="halign">end</property>
+                            <property name="margin-top">5</property>
+                            <property name="margin-bottom">5</property>
                             <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxDrawAlignTop">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">icons</property>
+                            <property name="show-arrow">False</property>
                             <child>
-                              <object class="GtkBox" id="box6">
+                              <object class="GtkToolButton" id="btnDrawObjectAlignLeft">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="first4">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkMenuToolButton" id="Draw-XLineStyle2">
-                                        <property name="width_request">100</property>
-                                        <property name="visible">True</property>
-                                        <property name="valign">center</property>
-                                        <property name="action_name">.uno:XLineStyle</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">False</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Draw-LineWidth">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:LineWidth</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">True</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="SectionBottom38">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="Draw-LineEndStyle1">
-                                        <property name="action_name">.uno:LineEndStyle</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">True</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Draw-XLineColor">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:XLineColor</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">True</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:ObjectAlignLeft</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
+                                <property name="homogeneous">True</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom50">
+                              <object class="GtkToolButton" id="btnDrawAlignCenter">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="hexpand">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-FillStyle2">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:FillStyle</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:AlignCenter</property>
                               </object>
                               <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnDrawObjectAlignRight">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:ObjectAlignRight</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnDrawBringToFront">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:BringToFront</property>
+                                <property name="use-underline">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnDrawObjectForwardOne">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:ObjectForwardOne</property>
+                                <property name="use-underline">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</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="left-attach">0</property>
+                            <property name="top-attach">0</property>
                           </packing>
                         </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxDrawAlignBottom">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">icons</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnDrawAlignUp">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:AlignUp</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnDrawAlignMiddle">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:AlignMiddle</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnDrawAlignDown">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:AlignDown</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnDrawSendToBack">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:SendToBack</property>
+                                <property name="use-underline">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnDrawObjectBackOne">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:ObjectBackOne</property>
+                                <property name="use-underline">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbDrawPositioning"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -11848,72 +10149,179 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="VclOptionalBox" id="Draw-Section-FormatLineArea4">
+                      <!-- n-columns=4 n-rows=3 -->
+                      <object class="GtkGrid" id="gdDrawCombination">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">3</property>
+                        <property name="margin-end">3</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
                         <child>
-                          <object class="GtkBox" id="box8">
+                          <object class="GtkLabel" id="lbDrawCombination">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">end</property>
+                            <property name="vexpand">True</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|labelDrawCombination">Combination</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gdDrawCombination"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                            <property name="width">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="halign">end</property>
+                            <property name="margin-top">5</property>
+                            <property name="margin-bottom">5</property>
                             <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">3</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxDrawCombine">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">center</property>
+                            <property name="vexpand">True</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="first13">
+                              <object class="GtkToolButton" id="btnDrawCombine">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-LineEndStyle2">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:LineEndStyle</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:Combine</property>
                               </object>
                               <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom54">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-FillShadow">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:FillShadow</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </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">3</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">2</property>
                           </packing>
                         </child>
-                        <style>
-                          <class name="priority-14"/>
-                        </style>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxDrawCombineTop">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">center</property>
+                            <property name="vexpand">True</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnDrawIntersect">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:Intersect</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnDrawDismantle">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:Dismantle</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxDrawCombineBottom">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">center</property>
+                            <property name="vexpand">True</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnDrawMerge">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:Merge</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnDrawSubstract">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:Substract</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxDrawDistributeSelection">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">center</property>
+                            <property name="vexpand">True</property>
+                            <property name="toolbar-style">both</property>
+                            <property name="show-arrow">False</property>
+                            <property name="icon_size">3</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnDrawDistributeSelection">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:DistributeSelection</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">2</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">2</property>
+                          </packing>
+                        </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbDrawCombination"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -11922,114 +10330,144 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="VclOptionalBox" id="Draw-Section-ObjectAlign">
+                      <!-- n-columns=3 n-rows=3 -->
+                      <object class="GtkGrid" id="gdDrawGrouping">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">3</property>
+                        <property name="margin-end">3</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
                         <child>
-                          <object class="GtkSeparator" id="separator81">
+                          <object class="GtkLabel" id="lbDrawGrouping">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">end</property>
+                            <property name="vexpand">True</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|labelDrawGrouping">Grouping</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gdDrawGrouping"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                            <property name="width">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="halign">end</property>
+                            <property name="margin-top">5</property>
+                            <property name="margin-bottom">5</property>
                             <property name="orientation">vertical</property>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
+                            <property name="left-attach">2</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="svtlo-ManagedMenuButton" id="Draw-ConvertButton:Menu Convert">
-                            <property name="label" translatable="yes" context="impressnotebookbar|ConvertMenuButton">Convert</property>
-                            <property name="width_request">70</property>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxDrawFormatGroup">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                            <property name="action_name">.uno:ChangeBezier</property>
-                            <property name="image">changebezierImg</property>
-                            <property name="relief">none</property>
-                            <property name="use_underline">True</property>
-                            <property name="image_position">top</property>
-                            <property name="always_show_image">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="VclOptionalBox" id="Draw-Section-ObjectAlign2">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
+                            <property name="toolbar-style">both</property>
+                            <property name="show-arrow">False</property>
+                            <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkBox" id="box25">
+                              <object class="GtkToolButton" id="btnDrawFormatGroup">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <child>
-                                  <object class="GtkBox" id="AlignGroup7">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="orientation">vertical</property>
-                                    <child>
-                                      <object class="sfxlo-NotebookbarToolBox" id="Align13">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="toolbar_style">icons</property>
-                                        <property name="show_arrow">False</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="sfxlo-NotebookbarToolBox" id="Align14">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="toolbar_style">icons</property>
-                                        <property name="show_arrow">False</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">1</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:FormatGroup</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnDrawFormatUngroup">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:FormatUngroup</property>
+                                <property name="use-underline">True</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">2</property>
+                                <property name="homogeneous">True</property>
                               </packing>
                             </child>
-                            <style>
-                              <class name="priority-10"/>
-                            </style>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">2</property>
                           </packing>
                         </child>
-                        <style>
-                          <class name="priority-13"/>
-                        </style>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxDrawEnterGroup">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</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="btnDrawEnterGroup">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:EnterGroup</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxDrawLeaveGroup">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</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="btnDrawLeaveGroup">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:LeaveGroup</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbDrawGrouping"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -12038,123 +10476,133 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="VclOptionalBox" id="Draw-Section-ObjectAlign1">
+                      <!-- n-columns=2 n-rows=3 -->
+                      <object class="GtkGrid" id="gdDraw3D">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">3</property>
+                        <property name="margin-end">6</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
                         <child>
-                          <object class="GtkBox" id="box4">
+                          <object class="GtkLabel" id="lbDraw3D">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">end</property>
+                            <property name="vexpand">True</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|labelDraw3D">3D</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gdDraw3D"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="halign">end</property>
+                            <property name="margin-top">5</property>
+                            <property name="margin-bottom">5</property>
+                            <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxDrawExtrusionToggle">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
                             <child>
-                              <object class="GtkBox" id="AlignGroup1">
+                              <object class="GtkToolButton" id="btnDrawExtrusionToggle">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="orientation">vertical</property>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="Align1">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="Draw-ObjectAlignLeft">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:ObjectAlignLeft</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Draw-AlignCenter">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:AlignCenter</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Draw-ObjectAlignRight">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:ObjectAlignRight</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="Align2">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="Image-AlignUp1">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:AlignUp</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Image-AlignMiddle1">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:AlignMiddle</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Image-AlignDown1">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:AlignDown</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:ExtrusionToggle</property>
                               </object>
                               <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</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="left-attach">0</property>
+                            <property name="top-attach">0</property>
                           </packing>
                         </child>
-                        <style>
-                          <class name="priority-12"/>
-                        </style>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxDrawExtrusionOptions">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">icons</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnDrawExtrusionDepthFloater">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:ExtrusionDepthFloater</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnDrawExtrusionDirectionFloater">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:ExtrusionDirectionFloater</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkMenuToolButton" id="btnDrawExtrusion3DColor">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:Extrusion3DColor</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkMenuToolButton" id="btnDrawExtrusionSurfaceFloater">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:ExtrusionSurfaceFloater</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">False</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbDraw3D"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -12162,992 +10610,6 @@
                         <property name="position">5</property>
                       </packing>
                     </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Draw-Section-Arrange">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator58">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <!-- n-columns=1 n-rows=1 -->
-                          <object class="GtkGrid" id="grid2">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="first8">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-BringToFront">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:BringToFront</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="second1">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-SendToBack">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:SendToBack</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="first9">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-Forward">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:Forward</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="Second1">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-Backward">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:Backward</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-11"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">6</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Draw-Section-Bezier">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator66">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom56">
-                            <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</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Draw-ToggleObjectBezierMode">
-                                <property name="visible">True</property>
-                                <property name="action_name">.uno:ToggleObjectBezierMode</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">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-10"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">7</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Draw-Section-Bezier1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="BezierGroup1">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom91">
-                                <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="Draw-BezierConvert">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:BezierConvert</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-BezierClose">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:BezierClose</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="BackgroundFront1">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-BezierSymmetric">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:BezierSymmetric</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-BezierEliminatePoints">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:BezierEliminatePoints</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-9"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">8</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Draw-Section-Bezier2">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="BezierGroup">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom71">
-                                <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="Draw-BezierMove">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:BezierMove</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-BezierInsert">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:BezierInsert</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-BezierDelete">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:BezierDelete</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="BackgroundFront2">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-BezierCutLine">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:BezierCutLine</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-BezierEdge">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:BezierEdge</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-BezierSmooth">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:BezierSmooth</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-8"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">9</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Draw-Section-GluePoint">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator67">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom137">
-                            <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</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Draw-GlueEditMode">
-                                <property name="visible">True</property>
-                                <property name="action_name">.uno:GlueEditMode</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">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-7"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">10</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Draw-Section-MergeCombine">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB102">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom147">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-Combine">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:Combine</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-Dismantle">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:Dismantle</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-DistributeSelection">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:DistributeSelection</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">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom148">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-Merge">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:Merge</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-Substract">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:Substract</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-Intersect">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:Intersect</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">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-6"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">11</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Draw-Section-Group">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator132">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom51">
-                            <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</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Draw-FormatGroup">
-                                <property name="visible">True</property>
-                                <property name="action_name">.uno:FormatGroup</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">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-5"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">12</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Draw-Section-Group1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB70">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom52">
-                                <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="Draw-EnterGroup">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:EnterGroup</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">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom53">
-                                <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="Draw-LeaveGroup">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:LeaveGroup</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">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-4"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">13</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Draw-Section-3D">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator24">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="GroupB73">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="first38">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-ExtrusionToggle">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:ExtrusionToggle</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">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="second39">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-ExtrusionDepthFloater">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:ExtrusionDepthFloater</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-ExtrusionDirectionFloater">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:ExtrusionDirectionFloater</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkMenuToolButton" id="Draw-Extrusion3DColor">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:Extrusion3DColor</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">False</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkMenuToolButton" id="Draw-ExtrusionSurfaceFloater">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:ExtrusionSurfaceFloater</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">False</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-3"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">14</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Draw-Section-Fontwork">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator63">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom96">
-                            <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</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Draw-FontworkGalleryFloater">
-                                <property name="visible">True</property>
-                                <property name="action_name">.uno:FontworkGalleryFloater</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">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-2"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">15</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Draw-Section-Fontwork1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB75">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom108">
-                                <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="Draw-FontworkShapeType">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:FontworkShapeType</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-FontworkSameLetterHeights">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:FontworkSameLetterHeights</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">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom99">
-                                <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="Draw-FontworkAlignmentFloater">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:FontworkAlignmentFloater</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-FontworkCharacterSpacingFloater">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:FontworkCharacterSpacingFloater</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">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-1"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">16</property>
-                      </packing>
-                    </child>
                   </object>
                   <packing>
                     <property name="expand">True</property>
@@ -13158,29 +10620,29 @@
                 <child>
                   <object class="sfxlo-DropdownBox" id="Draw-Menu">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="halign">end</property>
                     <property name="valign">center</property>
                     <property name="vexpand">True</property>
                     <child>
                       <object class="GtkBox" id="GroupB74">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="valign">center</property>
                         <property name="vexpand">True</property>
                         <property name="orientation">vertical</property>
                         <child>
                           <object class="svtlo-ManagedMenuButton" id="Draw-DrawButton:Menu Draw">
-                            <property name="label" translatable="yes" context="impressnotebookbar|DrawMenuButton">_Draw</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|DrawMenuButton">_Draw</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="focus_on_click">False</property>
-                            <property name="receives_default">False</property>
+                            <property name="can-focus">True</property>
+                            <property name="focus-on-click">False</property>
+                            <property name="receives-default">False</property>
                             <property name="halign">end</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
                             <property name="relief">none</property>
-                            <property name="use_underline">True</property>
+                            <property name="use-underline">True</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -13191,17 +10653,18 @@
                         <child>
                           <object class="sfxlo-NotebookbarToolBox" id="SectionBottom48">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                            <property name="can-focus">True</property>
                             <property name="halign">end</property>
                             <property name="hexpand">True</property>
-                            <property name="toolbar_style">icons</property>
-                            <property name="show_arrow">False</property>
+                            <property name="toolbar-style">icons</property>
+                            <property name="show-arrow">False</property>
                             <property name="icon_size">1</property>
                             <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>
+                                <property name="action-name">.uno:FormatArea</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -13211,8 +10674,9 @@
                             <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>
+                                <property name="action-name">.uno:FormatLine</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -13222,8 +10686,9 @@
                             <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>
+                                <property name="action-name">.uno:TransformDialog</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -13248,27 +10713,10 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
-                    <property name="pack_type">end</property>
+                    <property name="pack-type">end</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
-                <child>
-                  <object class="GtkSeparator" id="separator71">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">end</property>
-                    <property name="margin_top">5</property>
-                    <property name="margin_bottom">5</property>
-                    <property name="orientation">vertical</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="padding">5</property>
-                    <property name="pack_type">end</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
               </object>
               <packing>
                 <property name="position">10</property>
@@ -13277,9 +10725,9 @@
             <child type="tab">
               <object class="GtkLabel" id="DrawLabel">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="impressnotebookbar|DrawLabel">~Draw</property>
-                <property name="use_underline">True</property>
+                <property name="can-focus">False</property>
+                <property name="label" translatable="yes" context="TabbedImpress|DrawTabLabel">~Draw</property>
+                <property name="use-underline">True</property>
                 <style>
                   <class name="context-Draw"/>
                   <class name="context-DrawLine"/>
@@ -13289,40 +10737,101 @@
               </object>
               <packing>
                 <property name="position">10</property>
-                <property name="tab_fill">False</property>
+                <property name="tab-fill">False</property>
               </packing>
             </child>
             <child>
-              <object class="sfxlo-PriorityHBox" id="Object Tab">
+              <object class="sfxlo-PriorityHBox" id="Object">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <child>
-                  <object class="sfxlo-PriorityMergedHBox" id="Object">
+                  <object class="sfxlo-PriorityMergedHBox" id="pmhbObject">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="valign">center</property>
                     <property name="vexpand">True</property>
                     <child>
-                      <object class="VclOptionalBox" id="Object-Section-Edit">
+                      <!-- n-columns=3 n-rows=3 -->
+                      <object class="GtkGrid" id="gdObject">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">6</property>
+                        <property name="margin-end">3</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
                         <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="Big2">
+                          <object class="GtkLabel" id="lbObject">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">end</property>
                             <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|labelObjectObject">Object</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gdObject"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                            <property name="width">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="halign">end</property>
+                            <property name="margin-top">5</property>
+                            <property name="margin-bottom">5</property>
+                            <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">2</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxObjectToggleRotate">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">icons</property>
+                            <property name="show-arrow">False</property>
                             <child>
-                              <object class="GtkToolButton" id="Object-AnimationEffects">
+                              <object class="GtkToolButton" id="btnObjectToggleObjectRotateMode">
                                 <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:AnimationEffects</property>
+                                <property name="action-name">.uno:ToggleObjectRotateMode</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnObjectFlipVertical">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:FlipVertical</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnObjectFlipHorizontal">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:FlipHorizontal</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -13331,114 +10840,67 @@
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">1</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkBox" id="GroupB55">
+                          <object class="sfxlo-NotebookbarToolBox" id="bxObjectTransformDialog">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
+                            <property name="vexpand">True</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="SectionBottom26">
+                              <object class="GtkToolButton" id="btnObjectTransformDialog">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
+                                <property name="can-focus">False</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="Object-ToggleObjectBezierMode">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:AdvancedMode</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
+                                <property name="action-name">.uno:TransformDialog</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom30">
-                                <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="Object-ToggleObjectRotateMode">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:ToggleObjectRotateMode</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Object-FlipVertical">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:FlipVertical</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Object-FlipHorizontal">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:FlipHorizontal</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Object-Shear">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:Shear</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Object-CrookSlant">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:CrookSlant</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
+                                <property name="homogeneous">False</property>
                               </packing>
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">2</property>
                           </packing>
                         </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxObjectOriginalSize">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</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="btnObjectOriginalSize">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:OriginalSize</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbObject"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -13447,84 +10909,206 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="VclOptionalBox" id="Object-Section-FormatLineArea">
+                      <!-- n-columns=4 n-rows=3 -->
+                      <object class="GtkGrid" id="gdObjectFillBorder">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">3</property>
+                        <property name="margin-end">3</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
                         <child>
-                          <object class="GtkSeparator" id="separator32">
+                          <object class="GtkLabel" id="lbObjectFillBorder">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">end</property>
+                            <property name="vexpand">True</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|labelObjectFillBorder">Fill &amp; Border</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gdObjectFillBorder"/>
+                            </accessibility>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                            <property name="width">3</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkBox" id="box14">
+                          <object class="GtkSeparator">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
+                            <property name="halign">end</property>
+                            <property name="margin-top">5</property>
+                            <property name="margin-bottom">5</property>
                             <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">3</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxObjectFormatArea">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">text</property>
+                            <property name="show-arrow">False</property>
                             <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="third3">
+                              <object class="GtkToolButton" id="btnObjectFormatArea">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">text</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-FormatLine3">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:FormatLine</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:FormatArea</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="third4">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">text</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-FormatArea3">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:FormatArea</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">True</property>
-                                <property name="position">1</property>
+                                <property name="homogeneous">False</property>
                               </packing>
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">1</property>
                           </packing>
                         </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxObjectFillStyle">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnObjectFillStyle">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:FillStyle</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">1</property>
+                            <property name="width">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxObjectFormatLine">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">text</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnObjectFormatLine">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:FormatLine</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">False</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxObjectLineStyleLeft">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">icons</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkMenuToolButton" id="btnObjectXLineStyle">
+                                <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>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnObjectLineWidth">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:LineWidth</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxObjectLineStyleRight">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">icons</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnObjectLineEndStyle">
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:LineEndStyle</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnObjectXLineColor">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:XLineColor</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnObjectFillShadow">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:FillShadow</property>
+                                <property name="use-underline">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">2</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbObjectFillBorder"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -13533,125 +11117,192 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="VclOptionalBox" id="Object-Section-FormatLineArea1">
+                      <!-- n-columns=2 n-rows=3 -->
+                      <object class="GtkGrid" id="gdObjectPositioning">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">3</property>
+                        <property name="margin-end">6</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
                         <child>
-                          <object class="GtkBox" id="box30">
+                          <object class="GtkLabel" id="lbObjectPositioning">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">end</property>
+                            <property name="vexpand">True</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|labelObjectPositioning">Positioning</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gdObjectPositioning"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="halign">end</property>
+                            <property name="margin-top">5</property>
+                            <property name="margin-bottom">5</property>
                             <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxObjectAlignTop">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">icons</property>
+                            <property name="show-arrow">False</property>
                             <child>
-                              <object class="GtkBox" id="box31">
+                              <object class="GtkToolButton" id="btnObjectObjectAlignLeft">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="first2">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkMenuToolButton" id="Object-XLineStyle5">
-                                        <property name="width_request">100</property>
-                                        <property name="visible">True</property>
-                                        <property name="valign">center</property>
-                                        <property name="action_name">.uno:XLineStyle</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">False</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="ObjectLineWidth2">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:LineWidth</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">True</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="SectionBottom46">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="Object-LineEndStyle5">
-                                        <property name="action_name">.uno:LineEndStyle</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">True</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Object-XLineColor4">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:XLineColor</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">True</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:ObjectAlignLeft</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
+                                <property name="homogeneous">True</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom47">
+                              <object class="GtkToolButton" id="btnObjectAlignCenter">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="hexpand">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Object-FillStyle1">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:FillStyle</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:AlignCenter</property>
                               </object>
                               <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnObjectObjectAlignRight">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:ObjectAlignRight</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnObjectBringToFront">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:BringToFront</property>
+                                <property name="use-underline">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnObjectObjectForwardOne">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:ObjectForwardOne</property>
+                                <property name="use-underline">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</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="left-attach">0</property>
+                            <property name="top-attach">0</property>
                           </packing>
                         </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxObjectAlignBottom">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">icons</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnObjectAlignUp">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:AlignUp</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnObjectAlignMiddle">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:AlignMiddle</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnObjectAlignDown">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:AlignDown</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnObjectSendToBack">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:SendToBack</property>
+                                <property name="use-underline">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnObjectObjectBackOne">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:ObjectBackOne</property>
+                                <property name="use-underline">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbObjectPositioning"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -13659,436 +11310,6 @@
                         <property name="position">2</property>
                       </packing>
                     </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Object-Section-FormatLineArea2">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="box16">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="first5">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Object-LineEndStyle1">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:LineEndStyle</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">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom136">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Object-FillShadow1">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:FillShadow</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">3</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-4"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">3</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Object-Section-ObjectAlign">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator37">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="svtlo-ManagedMenuButton" id="Object-ConvertButton:Menu Convert">
-                            <property name="label" translatable="yes" context="impressnotebookbar|ConvertMenuButton">Convert</property>
-                            <property name="width_request">70</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                            <property name="action_name">.uno:ChangeBezier</property>
-                            <property name="image">changebezierImg</property>
-                            <property name="relief">none</property>
-                            <property name="use_underline">True</property>
-                            <property name="image_position">top</property>
-                            <property name="always_show_image">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="box17">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <child>
-                              <object class="GtkBox" id="AlignGroup4">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="orientation">vertical</property>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="Align7">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="Align8">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-3"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">4</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Object-Section-ObjectAlign1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="box26">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <child>
-                              <object class="GtkBox" id="AlignGroup8">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="orientation">vertical</property>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="Align15">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="Object-ObjectAlignLeft">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:ObjectAlignLeft</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Object-AlignCenter">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:AlignCenter</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Object-ObjectAlignRight">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:ObjectAlignRight</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="Align16">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="Object-AlignUp">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:AlignUp</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Object-AlignMiddle">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:AlignMiddle</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Object-AlignDown">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:AlignDown</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-2"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">5</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Object-Section-Arrange">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator82">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <!-- n-columns=1 n-rows=1 -->
-                          <object class="GtkGrid" id="grid3">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="first17">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Object-BringToFront">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:BringToFront</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="second4">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Object-SendToBack">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:SendToBack</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="first18">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Object-Forward">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:Forward</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="Second2">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Object-Backward">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:Backward</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-1"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">6</property>
-                      </packing>
-                    </child>
                   </object>
                   <packing>
                     <property name="expand">True</property>
@@ -14099,29 +11320,29 @@
                 <child>
                   <object class="sfxlo-DropdownBox" id="Object-Menu">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="halign">end</property>
                     <property name="valign">center</property>
                     <property name="vexpand">True</property>
                     <child>
                       <object class="GtkBox" id="GroupB71">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="valign">center</property>
                         <property name="vexpand">True</property>
                         <property name="orientation">vertical</property>
                         <child>
                           <object class="svtlo-ManagedMenuButton" id="Object-ObjectButton:Menu Object">
-                            <property name="label" translatable="yes" context="impressnotebookbar|ObjectMenuButton">_Object</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|ObjectMenuButton">_Object</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="focus_on_click">False</property>
-                            <property name="receives_default">False</property>
+                            <property name="can-focus">True</property>
+                            <property name="focus-on-click">False</property>
+                            <property name="receives-default">False</property>
                             <property name="halign">end</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
                             <property name="relief">none</property>
-                            <property name="use_underline">True</property>
+                            <property name="use-underline">True</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -14132,17 +11353,18 @@
                         <child>
                           <object class="sfxlo-NotebookbarToolBox" id="SectionBottom49">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                            <property name="can-focus">True</property>
                             <property name="halign">end</property>
                             <property name="hexpand">True</property>
-                            <property name="toolbar_style">icons</property>
-                            <property name="show_arrow">False</property>
+                            <property name="toolbar-style">icons</property>
+                            <property name="show-arrow">False</property>
                             <property name="icon_size">1</property>
                             <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>
+                                <property name="action-name">.uno:FormatArea</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -14152,8 +11374,9 @@
                             <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>
+                                <property name="action-name">.uno:FormatLine</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -14163,8 +11386,9 @@
                             <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>
+                                <property name="action-name">.uno:TransformDialog</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -14189,24 +11413,24 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
-                    <property name="pack_type">end</property>
+                    <property name="pack-type">end</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkSeparator" id="separator88">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="halign">end</property>
-                    <property name="margin_top">5</property>
-                    <property name="margin_bottom">5</property>
+                    <property name="margin-top">5</property>
+                    <property name="margin-bottom">5</property>
                     <property name="orientation">vertical</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">True</property>
                     <property name="padding">5</property>
-                    <property name="pack_type">end</property>
+                    <property name="pack-type">end</property>
                     <property name="position">2</property>
                   </packing>
                 </child>
@@ -14218,9 +11442,9 @@
             <child type="tab">
               <object class="GtkLabel" id="ObjectLabel">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="impressnotebookbar|ObjectLabel">~Object</property>
-                <property name="use_underline">True</property>
+                <property name="can-focus">False</property>
+                <property name="label" translatable="yes" context="TabbedImpress|ObjectTabLabel">~Object</property>
+                <property name="use-underline">True</property>
                 <style>
                   <class name="context-Frame"/>
                   <class name="context-OLE"/>
@@ -14228,40 +11452,81 @@
               </object>
               <packing>
                 <property name="position">11</property>
-                <property name="tab_fill">False</property>
+                <property name="tab-fill">False</property>
               </packing>
             </child>
             <child>
-              <object class="sfxlo-PriorityHBox" id="Media Tab">
+              <object class="sfxlo-PriorityHBox" id="Media">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <child>
-                  <object class="sfxlo-PriorityMergedHBox" id="Media">
+                  <object class="sfxlo-PriorityMergedHBox" id="pmhbMedia">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="valign">center</property>
                     <property name="vexpand">True</property>
                     <child>
-                      <object class="VclOptionalBox" id="Media-Section-Edit">
+                      <!-- n-columns=2 n-rows=3 -->
+                      <object class="GtkGrid" id="gdMedia">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">6</property>
+                        <property name="margin-end">3</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
                         <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom27">
+                          <object class="GtkLabel" id="lbMedia">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">end</property>
+                            <property name="vexpand">True</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|labelMediaMedia">Media</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gdMedia"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="halign">end</property>
+                            <property name="margin-top">5</property>
+                            <property name="margin-bottom">5</property>
+                            <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxMediaTransformDialog">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
+                            <property name="toolbar-style">both</property>
+                            <property name="show-arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="Media-NameGroup">
+                              <object class="GtkToolButton" id="btnMediaTransformDialog">
                                 <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:NameGroup</property>
+                                <property name="action-name">.uno:TransformDialog</property>
                               </object>
                               <packing>
                                 <property name="expand">True</property>
@@ -14270,70 +11535,14 @@
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="GroupB45">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom28">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Media-AVMediaPlayer">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:AVMediaPlayer</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom31">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Media-ToggleObjectRotateMode">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:ToggleObjectRotateMode</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">2</property>
                           </packing>
                         </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbMedia"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -14342,306 +11551,108 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="VclOptionalBox" id="Media-Section-ObjectAlign1">
+                      <!-- n-columns=2 n-rows=3 -->
+                      <object class="GtkGrid" id="gdMediaPositioning">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">3</property>
+                        <property name="margin-end">3</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
                         <child>
-                          <object class="GtkSeparator" id="separator31">
+                          <object class="GtkLabel" id="lbMediaPositioning">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">end</property>
+                            <property name="vexpand">True</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|labelMediaPositioning">Positioning</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gdMediaPositioning"/>
+                            </accessibility>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkBox" id="box33">
+                          <object class="GtkSeparator">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
+                            <property name="halign">end</property>
+                            <property name="margin-top">5</property>
+                            <property name="margin-bottom">5</property>
+                            <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxMediaAlignTop">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">icons</property>
+                            <property name="show-arrow">False</property>
                             <child>
-                              <object class="GtkBox" id="AlignGroup9">
+                              <object class="GtkToolButton" id="btnMediaObjectAlignLeft">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="orientation">vertical</property>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="Align17">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="Object-ObjectAlignLeft1">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:ObjectAlignLeft</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Object-AlignCenter1">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:AlignCenter</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Object-ObjectAlignRight1">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:ObjectAlignRight</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="Align18">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="Object-AlignUp1">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:AlignUp</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Object-AlignDown1">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:AlignDown</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Object-AlignMiddle1">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:AlignMiddle</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:ObjectAlignLeft</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</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>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-2"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">5</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Media-Section-Arrange">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator41">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <!-- n-columns=1 n-rows=1 -->
-                          <object class="GtkGrid" id="grid4">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="first12">
+                              <object class="GtkToolButton" id="btnMediaAlignCenter">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Media-BringToFront">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:BringToFront</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:AlignCenter</property>
                               </object>
                               <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">0</property>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="second6">
+                              <object class="GtkToolButton" id="btnMediaObjectAlignRight">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Media-SendToBack">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:SendToBack</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:ObjectAlignRight</property>
                               </object>
                               <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">1</property>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="first14">
+                              <object class="GtkToolButton" id="btnMediaBringToFront">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Media-Forward">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:Forward</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:BringToFront</property>
+                                <property name="use-underline">True</property>
                               </object>
                               <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">0</property>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="Second3">
+                              <object class="GtkToolButton" id="btnMediaObjectForwardOne">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Media-Backward">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:Backward</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-1"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">6</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Media-Section-AVMediaToolBox">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator86">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom138">
-                            <property name="width_request">148</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="show_arrow">False</property>
-                            <child>
-                              <object class="GtkToolButton" id="Media-AVMediaToolBox">
-                                <property name="visible">True</property>
-                                <property name="action_name">.uno:AVMediaToolBox</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:ObjectForwardOne</property>
+                                <property name="use-underline">True</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -14650,16 +11661,189 @@
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">True</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
                           </packing>
                         </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxMediaAlignBottom">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">icons</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnMediaAlignUp">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:AlignUp</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnMediaAlignMiddle">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:AlignMiddle</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnMediaAlignDown">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:AlignDown</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnMediaSendToBack">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:SendToBack</property>
+                                <property name="use-underline">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnMediaObjectBackOne">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:ObjectBackOne</property>
+                                <property name="use-underline">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbMediaPositioning"/>
+                        </accessibility>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <!-- n-columns=2 n-rows=3 -->
+                      <object class="GtkGrid" id="gdMediaPlayer">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">3</property>
+                        <property name="margin-end">6</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
+                        <child>
+                          <object class="GtkLabel" id="lbMediaPlayer">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">end</property>
+                            <property name="vexpand">True</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|labelMediaPlayer">Media Player</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gdMediaPlayer"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="halign">end</property>
+                            <property name="margin-top">5</property>
+                            <property name="margin-bottom">5</property>
+                            <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxMediaAVMediaToolBox">
+                            <property name="width-request">200</property>
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnMediaAVMediaToolBox">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:AVMediaToolBox</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxMediaAVMediaPlayer">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnMediaAVMediaPlayer">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:AVMediaPlayer</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbMediaPlayer"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="expand">True</property>
                         <property name="fill">True</property>
-                        <property name="position">7</property>
+                        <property name="position">2</property>
                       </packing>
                     </child>
                   </object>
@@ -14672,27 +11856,27 @@
                 <child>
                   <object class="sfxlo-DropdownBox" id="Media-Menu">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="halign">end</property>
                     <property name="valign">center</property>
                     <property name="vexpand">True</property>
                     <child>
                       <object class="GtkBox" id="GroupB53">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="valign">center</property>
                         <property name="vexpand">True</property>
                         <property name="orientation">vertical</property>
                         <child>
                           <object class="svtlo-ManagedMenuButton" id="media:Menu Media">
-                            <property name="label" translatable="yes" context="impressnotebookbar|MediaMenuButton">_Media</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|MediaMenuButton">_Media</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="focus_on_click">False</property>
-                            <property name="receives_default">False</property>
+                            <property name="can-focus">True</property>
+                            <property name="focus-on-click">False</property>
+                            <property name="receives-default">False</property>
                             <property name="halign">end</property>
                             <property name="relief">none</property>
-                            <property name="use_underline">True</property>
+                            <property name="use-underline">True</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -14703,17 +11887,18 @@
                         <child>
                           <object class="sfxlo-NotebookbarToolBox" id="SectionBottom25">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                            <property name="can-focus">True</property>
                             <property name="halign">end</property>
                             <property name="hexpand">True</property>
-                            <property name="toolbar_style">icons</property>
-                            <property name="show_arrow">False</property>
+                            <property name="toolbar-style">icons</property>
+                            <property name="show-arrow">False</property>
                             <property name="icon_size">1</property>
                             <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>
+                                <property name="action-name">.uno:FormatArea</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -14723,8 +11908,9 @@
                             <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>
+                                <property name="action-name">.uno:FormatLine</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -14734,7 +11920,8 @@
                             <child>
                               <object class="GtkToolButton" id="Media-TransformDialog">
                                 <property name="visible">True</property>
-                                <property name="action_name">.uno:TransformDialog</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:TransformDialog</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -14759,24 +11946,24 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
-                    <property name="pack_type">end</property>
+                    <property name="pack-type">end</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkSeparator" id="separator38">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="halign">end</property>
-                    <property name="margin_top">5</property>
-                    <property name="margin_bottom">5</property>
+                    <property name="margin-top">5</property>
+                    <property name="margin-bottom">5</property>
                     <property name="orientation">vertical</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">True</property>
                     <property name="padding">5</property>
-                    <property name="pack_type">end</property>
+                    <property name="pack-type">end</property>
                     <property name="position">2</property>
                   </packing>
                 </child>
@@ -14788,47 +11975,89 @@
             <child type="tab">
               <object class="GtkLabel" id="MediaLabel">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="impressnotebookbar|MediaLabel">~Media</property>
-                <property name="use_underline">True</property>
+                <property name="can-focus">False</property>
+                <property name="label" translatable="yes" context="TabbedImpress|MediaTabLabel">~Media</property>
+                <property name="use-underline">True</property>
                 <style>
                   <class name="context-Media"/>
                 </style>
               </object>
               <packing>
                 <property name="position">12</property>
-                <property name="tab_fill">False</property>
+                <property name="tab-fill">False</property>
               </packing>
             </child>
             <child>
-              <object class="sfxlo-PriorityHBox" id="Form Tab">
+              <object class="sfxlo-PriorityHBox" id="Form">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <child>
-                  <object class="sfxlo-PriorityMergedHBox" id="Form">
+                  <object class="sfxlo-PriorityMergedHBox" id="pmhbForm">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="valign">center</property>
                     <property name="vexpand">True</property>
                     <child>
-                      <object class="VclOptionalBox" id="Form-Section-Form">
+                      <!-- n-columns=3 n-rows=3 -->
+                      <object class="GtkGrid" id="gdFormMode">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">6</property>
+                        <property name="margin-end">3</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
                         <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom63">
+                          <object class="GtkLabel" id="lbFormMode">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">end</property>
+                            <property name="vexpand">True</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|labelFormMode">Mode</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gdFormMode"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                            <property name="width">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator" id="separator46">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="halign">end</property>
+                            <property name="margin-top">5</property>
+                            <property name="margin-bottom">5</property>
+                            <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">2</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxFormTransformDialog">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
+                            <property name="toolbar-style">both</property>
+                            <property name="show-arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="Form-SwitchControlDesignMode1">
+                              <object class="GtkToolButton" id="btnFormTransformDialog">
                                 <property name="visible">True</property>
-                                <property name="action_name">.uno:SwitchControlDesignMode</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:TransformDialog</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -14837,11 +12066,64 @@
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">2</property>
                           </packing>
                         </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxFormUseWizards">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</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="btnFormUseWizards">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:UseWizards</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxFormGroupBox">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</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="btnFormGroupBox">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:GroupBox</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbFormMode"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -14850,78 +12132,193 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="VclOptionalBox" id="Form-Section-Form1">
+                      <!-- n-columns=4 n-rows=3 -->
+                      <object class="GtkGrid" id="gdFormProperties">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">3</property>
+                        <property name="margin-end">3</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
                         <child>
-                          <object class="GtkBox" id="GroupB25">
+                          <object class="GtkLabel" id="lbFormProperties">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">end</property>
                             <property name="vexpand">True</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|labelFormProperties">Properties</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gdFormProperties"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                            <property name="width">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator" id="separator47">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="halign">end</property>
+                            <property name="margin-top">5</property>
+                            <property name="margin-bottom">5</property>
                             <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">3</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxFormFormProperties">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
                             <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin2">
+                              <object class="GtkToolButton" id="btnFormFormProperties">
                                 <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="Form-UseWizards">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:UseWizards</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:FormProperties</property>
                               </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="belowspacing1">
-                                <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="Form-GroupBox">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:GroupBox</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</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>
+                                <property name="homogeneous">True</property>
                               </packing>
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
                           </packing>
                         </child>
-                        <style>
-                          <class name="priority-5"/>
-                        </style>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxFormShowFmExplorer">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnFormShowFmExplorer">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:ShowFmExplorer</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxFormTabDialog">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnFormTabDialog">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:TabDialog</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxFormOpenReadOnly">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnFormOpenReadOnly">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:OpenReadOnly</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxFormControlProperties">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnFormControlProperties">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:ControlProperties</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">2</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxFormAutoControlFocus">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnFormAutoControlFocus">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:AutoControlFocus</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">2</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbFormProperties"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -14930,86 +12327,325 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="VclOptionalBox" id="Form-Section-Form2">
+                      <!-- n-columns=4 n-rows=3 -->
+                      <object class="GtkGrid" id="gdFormControls">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">3</property>
+                        <property name="margin-end">6</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
                         <child>
-                          <object class="GtkSeparator" id="separator39">
+                          <object class="GtkLabel" id="lbFormControls">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="GroupB52">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">end</property>
                             <property name="vexpand">True</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|labelFormControls">Controls</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gdFormControls"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                            <property name="width">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator" id="separator48">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="halign">end</property>
+                            <property name="margin-top">5</property>
+                            <property name="margin-bottom">5</property>
                             <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">3</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxFormControls1">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">icons</property>
+                            <property name="show-arrow">False</property>
                             <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom114">
+                              <object class="GtkToolButton" id="btnFormLabel">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Form-FormProperties">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:FormProperties</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:Label</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
+                                <property name="homogeneous">True</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom115">
+                              <object class="GtkToolButton" id="btnFormEdit">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Form-ShowFmExplorer">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:ShowFmExplorer</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:Edit</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnFormCheckBox">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:CheckBox</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
                               </packing>
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
                           </packing>
                         </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxFormControls2">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">icons</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnFormRadioButton">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:RadioButton</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnFormListBox">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:ListBox</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnFormComboBox">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:ComboBox</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxFormControls3">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">icons</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnFormNumericField">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:NumericField</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnFormCurrencyField">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:CurrencyField</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnFormPatternField">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:PatternField</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxFormControls4">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">icons</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnFormFormattedField">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:FormattedField</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnFormDateField">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:DateField</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnFormTimeField">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:TimeField</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxFormControls5">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">icons</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnFormPushbutton">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:Pushbutton</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnFormImagebutton">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:Imagebutton</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnFormImageControl">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:ImageControl</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">2</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxFormControls6">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">icons</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnFormFileControl">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:FileControl</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnFormNavigationBar">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:NavigationBar</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnFormGrid">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:Grid</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">2</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbFormControls"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -15017,563 +12653,6 @@
                         <property name="position">2</property>
                       </packing>
                     </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Form-Section-Form3">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB54">
-                            <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>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom109">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Form-TabDialog1">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:TabDialog</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom110">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Form-OpenReadOnly1">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:OpenReadOnly</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">3</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Form-Section-Form4">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator40">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="GroupB56">
-                            <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>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom111">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Form-ControlProperties2">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:ControlProperties</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom112">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Form-AutoControlFocus2">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:AutoControlFocus</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-4"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">4</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Form-Section-Form5">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator42">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="GroupB68">
-                            <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>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom113">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-Label1">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:Label</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-Edit1">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:Edit</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-CheckBox1">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:CheckBox</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom116">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-RadioButton2">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:RadioButton</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-ListBox2">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:ListBox</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-ComboBox2">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:ComboBox</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</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>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-3"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">5</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Tools-Section-Form6">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator87">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="GroupB96">
-                            <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>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom120">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-NumericField2">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:NumericField</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-CurrencyField2">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:CurrencyField</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-PatternField2">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:PatternField</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom123">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-FormattedField1">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:FormattedField</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-DateField1">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:DateField</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-TimeField1">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:TimeField</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-2"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">6</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Form-Section-Form7">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator89">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="GroupB72">
-                            <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>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom140">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Form-Pushbutton">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:Pushbutton</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Form-Imagebutton">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:Imagebutton</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Form-ImageControl">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:ImageControl</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom141">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Form-FileControl">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:FileControl</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Form-NavigationBar">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:NavigationBar</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Form-Grid">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:Grid</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-1"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">7</property>
-                      </packing>
-                    </child>
                   </object>
                   <packing>
                     <property name="expand">True</property>
@@ -15584,29 +12663,29 @@
                 <child>
                   <object class="sfxlo-DropdownBox" id="Form-Menu">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="halign">end</property>
                     <property name="valign">center</property>
                     <property name="vexpand">True</property>
                     <child>
                       <object class="GtkBox" id="Form-Section">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="valign">center</property>
                         <property name="vexpand">True</property>
                         <property name="orientation">vertical</property>
                         <child>
                           <object class="svtlo-ManagedMenuButton" id="Form-FormButton:Menu Form">
-                            <property name="label" translatable="yes" context="impressnotebookbar|FormMenuButton">Fo_rm</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|FormMenuButton">Fo_rm</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="focus_on_click">False</property>
-                            <property name="receives_default">False</property>
+                            <property name="can-focus">True</property>
+                            <property name="focus-on-click">False</property>
+                            <property name="receives-default">False</property>
                             <property name="halign">end</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
                             <property name="relief">none</property>
-                            <property name="use_underline">True</property>
+                            <property name="use-underline">True</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -15617,16 +12696,17 @@
                         <child>
                           <object class="sfxlo-NotebookbarToolBox" id="SectionBottom58">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                            <property name="can-focus">True</property>
                             <property name="halign">end</property>
                             <property name="hexpand">True</property>
-                            <property name="toolbar_style">both-horiz</property>
-                            <property name="show_arrow">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
                             <property name="icon_size">1</property>
                             <child>
                               <object class="GtkToolButton" id="FormMenu-FormProperties">
                                 <property name="visible">True</property>
-                                <property name="action_name">.uno:FormProperties</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:FormProperties</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -15651,27 +12731,10 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
-                    <property name="pack_type">end</property>
+                    <property name="pack-type">end</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
-                <child>
-                  <object class="GtkSeparator" id="separator25">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">end</property>
-                    <property name="margin_top">5</property>
-                    <property name="margin_bottom">5</property>
-                    <property name="orientation">vertical</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="padding">5</property>
-                    <property name="pack_type">end</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
               </object>
               <packing>
                 <property name="position">13</property>
@@ -15680,47 +12743,83 @@
             <child type="tab">
               <object class="GtkLabel" id="FormLabel">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="ImpressNotebookbar|FormLabel">Fo~rm</property>
-                <property name="use_underline">True</property>
+                <property name="can-focus">False</property>
+                <property name="label" translatable="yes" context="TabbedImpress|FormTabLabel">Fo~rm</property>
+                <property name="use-underline">True</property>
                 <style>
                   <class name="context-Form"/>
                 </style>
               </object>
               <packing>
                 <property name="position">13</property>
-                <property name="tab_fill">False</property>
+                <property name="tab-fill">False</property>
               </packing>
             </child>
             <child>
-              <object class="sfxlo-PriorityHBox" id="Master Tab">
+              <object class="sfxlo-PriorityHBox" id="Master">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <child>
-                  <object class="sfxlo-PriorityMergedHBox" id="MasterPage">
+                  <object class="sfxlo-PriorityMergedHBox" id="pmhbMaster">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="valign">center</property>
                     <property name="vexpand">True</property>
                     <child>
-                      <object class="VclOptionalBox" id="Master-Section-View">
+                      <!-- n-columns=5 n-rows=3 -->
+                      <object class="GtkGrid" id="gdMaster">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">6</property>
+                        <property name="margin-end">3</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
                         <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom101">
+                          <object class="GtkLabel" id="lbMaster">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|labelMaster">Master</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gdMaster"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                            <property name="width">4</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">4</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxMasterRenameMasterPag">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
                             <child>
-                              <object class="GtkToolButton" id="View-NormalMultiPaneGUI1">
+                              <object class="GtkToolButton" id="btnMasterRenameMasterPage">
                                 <property name="visible">True</property>
-                                <property name="action_name">.uno:NormalMultiPaneGUI</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:RenameMasterPage</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -15729,11 +12828,142 @@
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
                           </packing>
                         </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxMasterDeleteMasterPage">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</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="btnMasterDeleteMasterPage">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:DeleteMasterPage</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxMasterInsertMasterPage">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">center</property>
+                            <property name="vexpand">True</property>
+                            <property name="toolbar-style">both</property>
+                            <property name="show-arrow">False</property>
+                            <property name="icon_size">3</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnMasterInsertMasterPage">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:InsertMasterPage</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxMasterNotesMasterPage">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</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="btnMasterNotesMasterPage">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:NotesMasterPage</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">3</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxMasterHandoutMode">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</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="btnMasterHandoutMode">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:HandoutMode</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">3</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxMasterMasterLayouts">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">center</property>
+                            <property name="vexpand">True</property>
+                            <property name="toolbar-style">both</property>
+                            <property name="show-arrow">False</property>
+                            <property name="icon_size">3</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnMasterMasterLayouts">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:MasterLayouts</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">2</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">2</property>
+                          </packing>
+                        </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbMaster"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -15742,24 +12972,61 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="VclOptionalBox" id="Master-Section-View1">
+                      <!-- n-columns=4 n-rows=3 -->
+                      <object class="GtkGrid" id="gdMasterSlide">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">6</property>
+                        <property name="margin-end">3</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
                         <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom102">
+                          <object class="GtkLabel" id="lbMasterSlide">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|labelMasterSlide">Slide</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gdMasterSlide"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                            <property name="width">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">3</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxMasterSlideSetup">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
+                            <property name="toolbar-style">both</property>
+                            <property name="show-arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="View-DiaMode1">
+                              <object class="GtkToolButton" id="btnMasterSlideSetup">
                                 <property name="visible">True</property>
-                                <property name="action_name">.uno:DiaMode</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:SlideSetup</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -15768,14 +13035,114 @@
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">2</property>
                           </packing>
                         </child>
-                        <style>
-                          <class name="priority-6"/>
-                        </style>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxMasterSelectBackground">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</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="btnMasterSelectBackground">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:SelectBackground</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">2</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxMasterSaveBackground">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</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="btnMasterSaveBackground">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:SaveBackground</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">2</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxMasterHideSlide">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</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="btnMasterHideSlide">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:HideSlide</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxMasterShowSlide">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</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="btnMasterShowSlide">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:ShowSlide</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbMasterSlide"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -15784,78 +13151,75 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="VclOptionalBox" id="Master-Section-View2">
+                      <!-- n-columns=2 n-rows=3 -->
+                      <object class="GtkGrid" id="gdMasterClose">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">6</property>
+                        <property name="margin-end">3</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
                         <child>
-                          <object class="GtkBox" id="GroupB77">
+                          <object class="GtkLabel" id="lbMasterClose">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gdMasterClose"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxMasterCloseMasterView">
+                            <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="LeftParaMargin16">
+                              <object class="GtkToolButton" id="btnMasterCloseMasterView">
                                 <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-NotesMode1">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:NotesMode</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:CloseMasterView</property>
                               </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="belowspacing16">
-                                <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-OutlineMode1">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:OutlineMode</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</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>
+                                <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="left-attach">0</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">2</property>
                           </packing>
                         </child>
-                        <style>
-                          <class name="priority-5"/>
-                        </style>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbMasterClose"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -15863,596 +13227,6 @@
                         <property name="position">2</property>
                       </packing>
                     </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Master-Section-Master">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator53">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom104">
-                            <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</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="View-SlideMasterPage1">
-                                <property name="visible">True</property>
-                                <property name="action_name">.uno:SlideMasterPage</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">3</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Master-Section-Master1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB78">
-                            <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>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin17">
-                                <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-NotesMasterPage1">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:NotesMasterPage</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</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="belowspacing17">
-                                <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-HandoutMode1">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:HandoutMode</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</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>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-4"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">4</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="MasterPage-Section-Insert">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator54">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom106">
-                            <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</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="MasterPage-InsertMasterPage">
-                                <property name="visible">True</property>
-                                <property name="action_name">.uno:InsertMasterPage</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">5</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="MasterPage-Section-Insert1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB79">
-                            <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>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin8">
-                                <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="MasterPage-RenameMasterPage">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:RenameMasterPage</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</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="belowspacing8">
-                                <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="MasterPage-DeleteMasterPage">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:DeleteMasterPage</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</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>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-3"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">6</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Master-Section-MasterLayouts">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator55">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom107">
-                            <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</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="MasterPage-MasterLayouts1">
-                                <property name="visible">True</property>
-                                <property name="action_name">.uno:MasterLayouts</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">7</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Master-Section-ShowHide">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB81">
-                            <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>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin15">
-                                <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="Master-HideSlide">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:HideSlide</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</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="belowspacing15">
-                                <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="Master-ShowSlide">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:ShowSlide</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</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>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-2"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">8</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="MasterPage-Section-Property">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator57">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom117">
-                            <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</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="MasterPageMenu-PageSetup1">
-                                <property name="visible">True</property>
-                                <property name="action_name">.uno:SlideSetup</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">9</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="MasterPage-Section-Background">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB82">
-                            <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>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin14">
-                                <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="MasterPage-SelectBackground">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:SelectBackground</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</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="belowspacing12">
-                                <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="MasterPage-SaveBackground">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:SaveBackground</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</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>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-1"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">10</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="MasterPage-Section-CloseMasterView">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator61">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom118">
-                            <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</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="MasterPage-CloseMasterView">
-                                <property name="visible">True</property>
-                                <property name="action_name">.uno:CloseMasterView</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">11</property>
-                      </packing>
-                    </child>
                   </object>
                   <packing>
                     <property name="expand">True</property>
@@ -16463,29 +13237,29 @@
                 <child>
                   <object class="sfxlo-DropdownBox" id="MasterPage-Menu">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="halign">end</property>
                     <property name="valign">center</property>
                     <property name="vexpand">True</property>
                     <child>
                       <object class="GtkBox" id="MasterPage-Section">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="valign">center</property>
                         <property name="vexpand">True</property>
                         <property name="orientation">vertical</property>
                         <child>
                           <object class="svtlo-ManagedMenuButton" id="Master-Menu:Menu Master">
-                            <property name="label" translatable="yes" context="impressnotebookbar|FormMenuButton">_Master</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|MasterMenuButton">_Master</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="focus_on_click">False</property>
-                            <property name="receives_default">False</property>
+                            <property name="can-focus">True</property>
+                            <property name="focus-on-click">False</property>
+                            <property name="receives-default">False</property>
                             <property name="halign">end</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
                             <property name="relief">none</property>
-                            <property name="use_underline">True</property>
+                            <property name="use-underline">True</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -16496,16 +13270,17 @@
                         <child>
                           <object class="sfxlo-NotebookbarToolBox" id="SectionBottom100">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                            <property name="can-focus">True</property>
                             <property name="halign">end</property>
                             <property name="hexpand">True</property>
-                            <property name="toolbar_style">both-horiz</property>
-                            <property name="show_arrow">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
                             <property name="icon_size">1</property>
                             <child>
                               <object class="GtkToolButton" id="MasterPageMenu-PageSetup">
                                 <property name="visible">True</property>
-                                <property name="action_name">.uno:SlideSetup</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:SlideSetup</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -16530,27 +13305,10 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
-                    <property name="pack_type">end</property>
+                    <property name="pack-type">end</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
-                <child>
-                  <object class="GtkSeparator" id="separator52">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">end</property>
-                    <property name="margin_top">5</property>
-                    <property name="margin_bottom">5</property>
-                    <property name="orientation">vertical</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="padding">5</property>
-                    <property name="pack_type">end</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
               </object>
               <packing>
                 <property name="position">14</property>
@@ -16559,47 +13317,96 @@
             <child type="tab">
               <object class="GtkLabel" id="MasterLabel">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="ImpressNotebookbar|MasterLabel">~Master</property>
-                <property name="use_underline">True</property>
+                <property name="can-focus">False</property>
+                <property name="label" translatable="yes" context="TabbedImpress|MasterTabLabel">~Master</property>
+                <property name="use-underline">True</property>
                 <style>
                   <class name="context-MasterPage"/>
                 </style>
               </object>
               <packing>
                 <property name="position">14</property>
-                <property name="tab_fill">False</property>
+                <property name="tab-fill">False</property>
               </packing>
             </child>
             <child>
-              <object class="sfxlo-PriorityHBox" id="Outline Tab">
+              <object class="sfxlo-PriorityHBox" id="Outline">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <child>
-                  <object class="sfxlo-PriorityMergedHBox" id="Outline">
+                  <object class="sfxlo-PriorityMergedHBox" id="pmhbOutline">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="valign">center</property>
                     <property name="vexpand">True</property>
                     <child>
-                      <object class="VclOptionalBox" id="View-Section-View3">
+                      <!-- n-columns=3 n-rows=3 -->
+                      <object class="GtkGrid" id="gdOutlineMode">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">6</property>
+                        <property name="margin-end">3</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
                         <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom64">
+                          <object class="GtkLabel" id="lbOutlineMode">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|labelOutlineMode">View Mode</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gdOutlineMode"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                            <property name="width">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">2</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxOutlineMode">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
+                            <property name="toolbar-style">both</property>
+                            <property name="show-arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="View-NormalMultiPaneGUI2">
+                              <object class="GtkToolButton" id="btnOutlineNormalMultiPaneGUI">
                                 <property name="visible">True</property>
-                                <property name="action_name">.uno:NormalMultiPaneGUI</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:NormalMultiPaneGUI</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btnOutlineDiaMode">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:DiaMode</property>
+                                <property name="use-underline">True</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -16608,11 +13415,64 @@
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">2</property>
                           </packing>
                         </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxOutlineNotesMode">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</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="btnOutlineNotesMode">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:NotesMode</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxOutlineOutlineMode">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</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="btnOutlineOutlineMode">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:OutlineMode</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbOutlineMode"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -16621,24 +13481,61 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="VclOptionalBox" id="View-Section-View4">
+                      <!-- n-columns=4 n-rows=3 -->
+                      <object class="GtkGrid" id="gdOutlineLevel">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">3</property>
+                        <property name="margin-end">3</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
                         <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom68">
+                          <object class="GtkLabel" id="lbOutlineLevel">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|labelOutlineLevel">Level</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gdOutlineLevel"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                            <property name="width">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">3</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxOutlineOutlineFormat">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
+                            <property name="toolbar-style">both</property>
+                            <property name="show-arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="View-DiaMode2">
+                              <object class="GtkToolButton" id="btnOutlineOutlineFormat">
                                 <property name="visible">True</property>
-                                <property name="action_name">.uno:DiaMode</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:OutlineFormat</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -16647,11 +13544,106 @@
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">2</property>
                           </packing>
                         </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxOutlineOutlineRight">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnOutlineOutlineRight">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:OutlineRight</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="LineB24">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnOutlineOutlineLeft">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:OutlineLeft</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxOutlineOutlineUp">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnOutlineOutlineUp">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:OutlineUp</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">2</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxOutlineOutlineDown">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnOutlineOutlineDown">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:OutlineDown</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">2</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbOutlineLevel"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -16660,75 +13652,150 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="VclOptionalBox" id="View-Section-View5">
+                      <!-- n-columns=3 n-rows=3 -->
+                      <object class="GtkGrid" id="gdOutlineShow">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">3</property>
+                        <property name="margin-end">6</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
                         <child>
-                          <object class="GtkBox" id="GroupB49">
+                          <object class="GtkLabel" id="lbOutlineShow">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|labelOutlineShow">Show</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gdOutlineShow"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                            <property name="width">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">2</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxOutlineOutlineCollapseAll">
+                            <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-horiz</property>
+                            <property name="show-arrow">False</property>
                             <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin7">
+                              <object class="GtkToolButton" id="btnOutlineOutlineCollapseAll">
                                 <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-NotesMode2">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:NotesMode</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:OutlineCollapseAll</property>
                               </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="belowspacing7">
-                                <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-OutlineMode2">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:OutlineMode</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</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>
+                                <property name="homogeneous">False</property>
                               </packing>
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
                           </packing>
                         </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxOutlineOutlineExpandAll">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</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="btnOutlineOutlineExpandAll">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:OutlineExpandAll</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">False</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin21">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</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="btnOutlineOutlineCollapse">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:OutlineCollapse</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxOutlineOutlineExpand">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</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="btnOutlineOutlineExpand">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:OutlineExpand</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">False</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbOutlineShow"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -16736,617 +13803,6 @@
                         <property name="position">2</property>
                       </packing>
                     </child>
-                    <child>
-                      <object class="VclOptionalBox" id="View-Section-Master2">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator35">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom70">
-                            <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</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="View-SlideMasterPage2">
-                                <property name="visible">True</property>
-                                <property name="action_name">.uno:SlideMasterPage</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-6"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">3</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="View-Section-Master3">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB50">
-                            <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>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin19">
-                                <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-NotesMasterPage2">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:NotesMasterPage</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</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="belowspacing19">
-                                <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-HandoutMode2">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:HandoutMode</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</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>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-5"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">4</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="View-Section-OutlineFormat">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator44">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom72">
-                            <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</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Outline-OutlineFormat">
-                                <property name="visible">True</property>
-                                <property name="action_name">.uno:OutlineFormat</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">5</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="View-Section-Outline">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB51">
-                            <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>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineA24">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="View-OutlineRight">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:OutlineRight</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineB24">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="View-OutlineLeft">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:OutlineLeft</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">6</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="View-Section-Outline1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB60">
-                            <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>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineA27">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="View-OutlineUp">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:OutlineUp</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineB27">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="View-OutlineDown">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:OutlineDown</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">3</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">7</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="View-Section-ColorView">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator46">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom73">
-                            <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</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="View-ColorView">
-                                <property name="visible">True</property>
-                                <property name="action_name">.uno:ColorView</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-4"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">8</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="View-Section-Visible4">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB61">
-                            <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>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin20">
-                                <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-OutlineCollapseAll">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:OutlineCollapseAll</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">False</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="belowspacing20">
-                                <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-OutlineExpandAll">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:OutlineExpandAll</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">False</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">3</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-3"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">9</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="View-Section-Visible5">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB65">
-                            <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>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin21">
-                                <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-OutlineCollapse">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:OutlineCollapse</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</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="belowspacing21">
-                                <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-OutlineExpand">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:OutlineExpand</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">False</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">3</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-2"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">10</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="View-Section-New1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator72">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom75">
-                            <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</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="View-NewWindow1">
-                                <property name="visible">True</property>
-                                <property name="action_name">.uno:NewWindow</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">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-1"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">13</property>
-                      </packing>
-                    </child>
                   </object>
                   <packing>
                     <property name="expand">True</property>
@@ -17357,29 +13813,29 @@
                 <child>
                   <object class="sfxlo-DropdownBox" id="Outline-Menu">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="halign">end</property>
                     <property name="valign">center</property>
                     <property name="vexpand">True</property>
                     <child>
                       <object class="GtkBox" id="View2-Section">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="valign">center</property>
                         <property name="vexpand">True</property>
                         <property name="orientation">vertical</property>
                         <child>
                           <object class="svtlo-ManagedMenuButton" id="View2-OutlineButton:Menu View">
-                            <property name="label" translatable="yes" context="ImpressNotebookbar|FormMenuButton">_View</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|ViewMenuButton">_View</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="focus_on_click">False</property>
-                            <property name="receives_default">False</property>
+                            <property name="can-focus">True</property>
+                            <property name="focus-on-click">False</property>
+                            <property name="receives-default">False</property>
                             <property name="halign">end</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
                             <property name="relief">none</property>
-                            <property name="use_underline">True</property>
+                            <property name="use-underline">True</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -17390,16 +13846,17 @@
                         <child>
                           <object class="sfxlo-NotebookbarToolBox" id="SectionBottom74">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                            <property name="can-focus">True</property>
                             <property name="halign">end</property>
                             <property name="hexpand">True</property>
-                            <property name="toolbar_style">both-horiz</property>
-                            <property name="show_arrow">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
                             <property name="icon_size">1</property>
                             <child>
                               <object class="GtkToolButton" id="OutlineMenu-NormalMultiPaneGUI">
                                 <property name="visible">True</property>
-                                <property name="action_name">.uno:NormalMultiPaneGUI</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:NormalMultiPaneGUI</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -17424,27 +13881,10 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
-                    <property name="pack_type">end</property>
+                    <property name="pack-type">end</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
-                <child>
-                  <object class="GtkSeparator" id="separator23">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">end</property>
-                    <property name="margin_top">5</property>
-                    <property name="margin_bottom">5</property>
-                    <property name="orientation">vertical</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="padding">5</property>
-                    <property name="pack_type">end</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
               </object>
               <packing>
                 <property name="position">15</property>
@@ -17453,165 +13893,200 @@
             <child type="tab">
               <object class="GtkLabel" id="OutlineLabel">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="ImpressNotebookbar|View2Label">~Outline</property>
-                <property name="use_underline">True</property>
+                <property name="can-focus">False</property>
+                <property name="label" translatable="yes" context="TabbedImpress|OutlineTabLabel">~Outline</property>
+                <property name="use-underline">True</property>
                 <style>
                   <class name="context-OutlineText"/>
                 </style>
               </object>
               <packing>
                 <property name="position">15</property>
-                <property name="tab_fill">False</property>
+                <property name="tab-fill">False</property>
               </packing>
             </child>
             <child>
-              <object class="sfxlo-PriorityHBox" id="3d Tab">
+              <object class="sfxlo-PriorityHBox" id="3D">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <child>
-                  <object class="sfxlo-PriorityMergedHBox" id="3d">
+                  <object class="sfxlo-PriorityMergedHBox" id="pmhb3D">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="valign">center</property>
                     <property name="vexpand">True</property>
                     <child>
-                      <object class="VclOptionalBox" id="3dObject-Section-Edit">
+                      <!-- n-columns=3 n-rows=3 -->
+                      <object class="GtkGrid" id="gd3DObject">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">6</property>
+                        <property name="margin-end">3</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
                         <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="Big3">
+                          <object class="GtkLabel" id="lb3DObject">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">end</property>
+                            <property name="vexpand">True</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|label3DObject">Drawing Object</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gd3DObject"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                            <property name="width">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="halign">end</property>
+                            <property name="margin-top">5</property>
+                            <property name="margin-bottom">5</property>
+                            <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">2</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bx3DTransformDialog">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
+                            <property name="toolbar-style">both</property>
+                            <property name="show-arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="3dObject-AnimationEffects">
+                              <object class="GtkToolButton" id="btn3DTransformDialog">
                                 <property name="visible">True</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <property name="action_name">.uno:AnimationEffects</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:TransformDialog</property>
+                                <property name="use-underline">True</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
-                                <property name="homogeneous">False</property>
+                                <property name="homogeneous">True</property>
                               </packing>
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">2</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkBox" id="GroupB69">
+                          <object class="sfxlo-NotebookbarToolBox" id="bx3DTop">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
+                            <property name="vexpand">True</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
                             <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom77">
+                              <object class="GtkToolButton" id="btn3DToggleObjectBezierMode">
                                 <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="3dObject-ToggleObjectBezierMode">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:AdvancedMode</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:AdvancedMode</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom78">
-                                <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="3dObject-ToggleObjectRotateMode">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:ToggleObjectRotateMode</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="3dObject-FlipVertical">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:FlipVertical</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="3dObject-FlipHorizontal">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:FlipHorizontal</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="3dObject-Shear">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:Shear</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="3dObject-CrookSlant">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:CrookSlant</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</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="left-attach">1</property>
+                            <property name="top-attach">0</property>
                           </packing>
                         </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bx3DBottom">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</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="btn3DToggleObjectRotateMode">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:ToggleObjectRotateMode</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btn3DFlipVertical">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:FlipVertical</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btn3DFlipHorizontal">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:FlipHorizontal</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btn3DShear">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:Shear</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btn3DCrookSlant">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:CrookSlant</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="lb3DObject"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -17620,328 +14095,63 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="VclOptionalBox" id="3dObject-Section-FormatLineArea">
+                      <!-- n-columns=4 n-rows=3 -->
+                      <object class="GtkGrid" id="gd3DFillBorder">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">3</property>
+                        <property name="margin-end">3</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
                         <child>
-                          <object class="GtkSeparator" id="separator48">
+                          <object class="GtkLabel" id="lb3DFillBorder">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="box18">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="third7">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">text</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-FormatLine4">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:FormatLine</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">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="third8">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">text</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-FormatArea4">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:FormatArea</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">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="3dObject-Section-FormatLineArea1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="box21">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="GtkBox" id="box22">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="first6">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkMenuToolButton" id="3dObject-XLineStyle5">
-                                        <property name="width_request">100</property>
-                                        <property name="visible">True</property>
-                                        <property name="valign">center</property>
-                                        <property name="action_name">.uno:XLineStyle</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">False</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="ObjectLineWidth1">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:LineWidth</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">True</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="SectionBottom93">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="3dObject-LineEndStyle5">
-                                        <property name="action_name">.uno:LineEndStyle</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">True</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="3dObject-XLineColor4">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:XLineColor</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">True</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom95">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="hexpand">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="3dObject-FillStyle1">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:FillStyle</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="3dObject-Section-FormatLineArea2">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="box24">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="first15">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="3dObject-LineEndStyle1">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:LineEndStyle</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">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom142">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="3dObject-FillShadow1">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:FillShadow</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">3</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-3"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">3</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="3dObject-Section-Windows3D">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator47">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="Big5">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">end</property>
                             <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|label3DFillBorder">Fill &amp; Border</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gd3DFillBorder"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                            <property name="width">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="halign">end</property>
+                            <property name="margin-top">5</property>
+                            <property name="margin-bottom">5</property>
+                            <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">3</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bx3DFormatArea">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">text</property>
+                            <property name="show-arrow">False</property>
                             <child>
-                              <object class="GtkToolButton" id="Draw-Window3D1">
+                              <object class="GtkToolButton" id="btn3DFormatArea">
                                 <property name="visible">True</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <property name="action_name">.uno:Window3D</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:FormatArea</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -17950,272 +14160,426 @@
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">1</property>
                           </packing>
                         </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">4</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="3dObject-Section-ObjectAlign">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
                         <child>
-                          <object class="GtkBox" id="box27">
+                          <object class="sfxlo-NotebookbarToolBox" id="bx3DFillStyle">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
                             <child>
-                              <object class="GtkBox" id="AlignGroup5">
+                              <object class="GtkToolButton" id="btn3DFillStyle">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="orientation">vertical</property>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="Align9">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="3dObject-ObjectAlignLeft">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:ObjectAlignLeft</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="3dObject-AlignCenter">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:AlignCenter</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="3dObject-ObjectAlignRight">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:ObjectAlignRight</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="Align10">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="3dObject-AlignUp">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:AlignUp</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="3dObject-AlignMiddle">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:AlignMiddle</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="3dObject-AlignDown">
-                                        <property name="visible">True</property>
-                                        <property name="action_name">.uno:AlignDown</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:FillStyle</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</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="left-attach">1</property>
+                            <property name="top-attach">1</property>
+                            <property name="width">2</property>
                           </packing>
                         </child>
-                        <style>
-                          <class name="priority-2"/>
-                        </style>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bx3DFormatLine">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">text</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btn3DFormatLine">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:FormatLine</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">False</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bx3DLineStyleLeft">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">icons</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkMenuToolButton" id="btn3DXLineStyle">
+                                <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>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btn3DLineWidth">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:LineWidth</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bx3DLineStyleRight">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">icons</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btn3DLineEndStyle">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:LineEndStyle</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btn3DXLineColor">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:XLineColor</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btn3DFillShadow">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:FillShadow</property>
+                                <property name="use-underline">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">2</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="lb3DFillBorder"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">5</property>
+                        <property name="position">1</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="VclOptionalBox" id="3dObject-Section-Arrange">
+                      <!-- n-columns=2 n-rows=3 -->
+                      <object class="GtkGrid" id="gd3DPositioning">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">3</property>
+                        <property name="margin-end">3</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
                         <child>
-                          <object class="GtkSeparator" id="separator90">
+                          <object class="GtkLabel" id="lb3DPositioning">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">end</property>
+                            <property name="vexpand">True</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|label3DPositioning">Positioning</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gd3DPositioning"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="halign">end</property>
+                            <property name="margin-top">5</property>
+                            <property name="margin-bottom">5</property>
                             <property name="orientation">vertical</property>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
                           </packing>
                         </child>
                         <child>
-                          <!-- n-columns=1 n-rows=1 -->
-                          <object class="GtkGrid" id="grid5">
+                          <object class="sfxlo-NotebookbarToolBox" id="bx3DAlignTop">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">icons</property>
+                            <property name="show-arrow">False</property>
                             <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="first16">
+                              <object class="GtkToolButton" id="btn3DObjectAlignLeft">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="3dObject-BringToFront">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:BringToFront</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:ObjectAlignLeft</property>
                               </object>
                               <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">0</property>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="second5">
+                              <object class="GtkToolButton" id="btn3DAlignCenter">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="3dObject-SendToBack">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:SendToBack</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:AlignCenter</property>
                               </object>
                               <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">1</property>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="first19">
+                              <object class="GtkToolButton" id="btn3DObjectAlignRight">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="3dObject-Forward">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:Forward</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:ObjectAlignRight</property>
                               </object>
                               <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">0</property>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="Second4">
+                              <object class="GtkToolButton" id="btn3DbringToFront">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="3dObject-Backward">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:Backward</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:BringToFront</property>
+                                <property name="use-underline">True</property>
                               </object>
                               <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">1</property>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btn3DObjectForwardOne">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:ObjectForwardOne</property>
+                                <property name="use-underline">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
                               </packing>
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
                           </packing>
                         </child>
-                        <style>
-                          <class name="priority-1"/>
-                        </style>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bx3DAlignBottom">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">icons</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btn3DAlignUp">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:AlignUp</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btn3DAlignMiddle">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:AlignMiddle</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btn3DAlignDown">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:AlignDown</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btn3DSendToBack">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:SendToBack</property>
+                                <property name="use-underline">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="btn3DObjectBackOne">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:ObjectBackOne</property>
+                                <property name="use-underline">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="lb3DPositioning"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">6</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <!-- n-columns=2 n-rows=3 -->
+                      <object class="GtkGrid" id="gd3D">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">3</property>
+                        <property name="margin-end">6</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
+                        <child>
+                          <object class="GtkLabel" id="lb3D">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">end</property>
+                            <property name="vexpand">True</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|label3D3D">3D</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gd3D"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="halign">end</property>
+                            <property name="margin-top">5</property>
+                            <property name="margin-bottom">5</property>
+                            <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bx3DWindow3D">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">center</property>
+                            <property name="vexpand">True</property>
+                            <property name="toolbar-style">both</property>
+                            <property name="show-arrow">False</property>
+                            <property name="icon_size">3</property>
+                            <child>
+                              <object class="GtkToolButton" id="btn3DWindow3D">
+                                <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:Window3D</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">False</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">2</property>
+                          </packing>
+                        </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="lb3D"/>
+                        </accessibility>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">3</property>
                       </packing>
                     </child>
                   </object>
@@ -18228,29 +14592,29 @@
                 <child>
                   <object class="sfxlo-DropdownBox" id="3dObject-Menu">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="halign">end</property>
                     <property name="valign">center</property>
                     <property name="vexpand">True</property>
                     <child>
                       <object class="GtkBox" id="3dObject-Section">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="valign">center</property>
                         <property name="vexpand">True</property>
                         <property name="orientation">vertical</property>
                         <child>
                           <object class="svtlo-ManagedMenuButton" id="3dObject-FormButton:Menu 3d">
-                            <property name="label" translatable="yes" context="impressnotebookbar|FormMenuButton">3_d</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|3DMenuButton">3_D</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="focus_on_click">False</property>
-                            <property name="receives_default">False</property>
+                            <property name="can-focus">True</property>
+                            <property name="focus-on-click">False</property>
+                            <property name="receives-default">False</property>
                             <property name="halign">end</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
                             <property name="relief">none</property>
-                            <property name="use_underline">True</property>
+                            <property name="use-underline">True</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -18261,17 +14625,18 @@
                         <child>
                           <object class="sfxlo-NotebookbarToolBox" id="SectionBottom119">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                            <property name="can-focus">True</property>
                             <property name="halign">end</property>
                             <property name="hexpand">True</property>
-                            <property name="toolbar_style">icons</property>
-                            <property name="show_arrow">False</property>
+                            <property name="toolbar-style">icons</property>
+                            <property name="show-arrow">False</property>
                             <property name="icon_size">1</property>
                             <child>
                               <object class="GtkToolButton" id="Draw-FormatArea5">
                                 <property name="visible">True</property>
+                                <property name="can-focus">False</property>
                                 <property name="valign">center</property>
-                                <property name="action_name">.uno:FormatArea</property>
+                                <property name="action-name">.uno:FormatArea</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -18281,8 +14646,9 @@
                             <child>
                               <object class="GtkToolButton" id="Draw-FormatLine5">
                                 <property name="visible">True</property>
+                                <property name="can-focus">False</property>
                                 <property name="valign">center</property>
-                                <property name="action_name">.uno:FormatLine</property>
+                                <property name="action-name">.uno:FormatLine</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -18292,8 +14658,9 @@
                             <child>
                               <object class="GtkToolButton" id="Draw-TransformDialog1">
                                 <property name="visible">True</property>
+                                <property name="can-focus">False</property>
                                 <property name="valign">center</property>
-                                <property name="action_name">.uno:TransformDialog</property>
+                                <property name="action-name">.uno:TransformDialog</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -18318,27 +14685,10 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
-                    <property name="pack_type">end</property>
+                    <property name="pack-type">end</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
-                <child>
-                  <object class="GtkSeparator" id="separator65">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">end</property>
-                    <property name="margin_top">5</property>
-                    <property name="margin_bottom">5</property>
-                    <property name="orientation">vertical</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="padding">5</property>
-                    <property name="pack_type">end</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
               </object>
               <packing>
                 <property name="position">16</property>
@@ -18347,32 +14697,32 @@
             <child type="tab">
               <object class="GtkLabel" id="3DObjectLabel">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="impressnotebookbar|FormLabel">3~d</property>
-                <property name="use_underline">True</property>
+                <property name="can-focus">False</property>
+                <property name="label" translatable="yes" context="TabbedImpress|3DTabLabel">3~D</property>
+                <property name="use-underline">True</property>
                 <style>
                   <class name="context-3DObject"/>
                 </style>
               </object>
               <packing>
                 <property name="position">16</property>
-                <property name="tab_fill">False</property>
+                <property name="tab-fill">False</property>
               </packing>
             </child>
             <child>
-              <object class="sfxlo-PriorityHBox" id="Extension Tab">
+              <object class="sfxlo-PriorityHBox" id="Extension">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <child>
-                  <object class="sfxlo-PriorityMergedHBox" id="Extension">
+                  <object class="sfxlo-PriorityMergedHBox" id="pmhbExtension">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="valign">center</property>
                     <property name="vexpand">True</property>
                     <child>
                       <object class="NotebookBarAddonsToolMergePoint" id="AddonCommand">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="valign">center</property>
                         <property name="vexpand">True</property>
                       </object>
@@ -18392,29 +14742,29 @@
                 <child>
                   <object class="sfxlo-DropdownBox" id="Extension-Menu">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="halign">end</property>
                     <property name="valign">center</property>
                     <property name="vexpand">True</property>
                     <child>
                       <object class="GtkBox" id="Extension-Section">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="valign">center</property>
                         <property name="vexpand">True</property>
                         <property name="orientation">vertical</property>
                         <child>
                           <object class="svtlo-ManagedMenuButton" id="Extension-ExtensionButton:Menu Addons">
-                            <property name="label" translatable="yes" context="impressnotebookbar|FormMenuButton">E_xtension</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|ExtensionMenuButton">E_xtension</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="focus_on_click">False</property>
-                            <property name="receives_default">False</property>
+                            <property name="can-focus">True</property>
+                            <property name="focus-on-click">False</property>
+                            <property name="receives-default">False</property>
                             <property name="halign">end</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
                             <property name="relief">none</property>
-                            <property name="use_underline">True</property>
+                            <property name="use-underline">True</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -18425,11 +14775,11 @@
                         <child>
                           <object class="sfxlo-NotebookbarToolBox" id="SectionBottom41">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                            <property name="can-focus">True</property>
                             <property name="halign">end</property>
                             <property name="hexpand">True</property>
-                            <property name="toolbar_style">both-horiz</property>
-                            <property name="show_arrow">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
                             <property name="icon_size">1</property>
                           </object>
                           <packing>
@@ -18449,24 +14799,24 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
-                    <property name="pack_type">end</property>
+                    <property name="pack-type">end</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkSeparator" id="separator50">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="halign">end</property>
-                    <property name="margin_top">5</property>
-                    <property name="margin_bottom">5</property>
+                    <property name="margin-top">5</property>
+                    <property name="margin-bottom">5</property>
                     <property name="orientation">vertical</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">True</property>
                     <property name="padding">5</property>
-                    <property name="pack_type">end</property>
+                    <property name="pack-type">end</property>
                     <property name="position">2</property>
                   </packing>
                 </child>
@@ -18478,59 +14828,86 @@
             <child type="tab">
               <object class="GtkLabel" id="ExtensionLabel">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="impressnotebookbar|ExtensionLabel">E~xtension</property>
-                <property name="use_underline">True</property>
+                <property name="can-focus">False</property>
+                <property name="label" translatable="yes" context="TabbedImpress|ExtensionTabLabel">E~xtension</property>
+                <property name="use-underline">True</property>
               </object>
               <packing>
                 <property name="position">17</property>
-                <property name="tab_fill">False</property>
+                <property name="tab-fill">False</property>
               </packing>
             </child>
             <child>
-              <object class="sfxlo-PriorityHBox" id="Tools Tab">
+              <object class="sfxlo-PriorityHBox" id="Tools">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <child>
-                  <object class="sfxlo-PriorityMergedHBox" id="Tools">
+                  <object class="sfxlo-PriorityMergedHBox" id="pmhbTools">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="valign">center</property>
                     <property name="vexpand">True</property>
                     <child>
-                      <object class="VclOptionalBox" id="Tools-Section-Macro">
+                      <!-- n-columns=3 n-rows=3 -->
+                      <object class="GtkGrid" id="gdToolsMacro">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">6</property>
+                        <property name="margin-end">6</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
                         <child>
-                          <object class="GtkSeparator" id="separator70">
+                          <object class="GtkLabel" id="lbToolsMacro">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">end</property>
+                            <property name="vexpand">True</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|labelToolsMacro">Macro</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gdToolsMacro"/>
+                            </accessibility>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                            <property name="width">2</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom121">
+                          <object class="GtkSeparator">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="halign">end</property>
+                            <property name="margin-top">5</property>
+                            <property name="margin-bottom">5</property>
+                            <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">2</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxToolsRunMacro">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
+                            <property name="toolbar-style">both</property>
+                            <property name="show-arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="Tools-RunMacro">
+                              <object class="GtkToolButton" id="btnToolsRunMacro">
                                 <property name="visible">True</property>
-                                <property name="action_name">.uno:RunMacro</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:RunMacro</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -18539,11 +14916,59 @@
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">2</property>
                           </packing>
                         </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxToolsBasicIDEAppear">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnToolsBasicIDEAppear">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:BasicIDEAppear</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxToolsMacroDialog">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnToolsMacroDialog">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:MacroDialog</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbToolsMacro"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -18551,874 +14976,6 @@
                         <property name="position">0</property>
                       </packing>
                     </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Tools-Section-Macro1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB83">
-                            <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>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineA25">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-BasicIDEAppear">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:BasicIDEAppear</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineB26">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-MacroDialog">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:MacroDialog</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-7"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Tools-Section-Presentation">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator84">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom122">
-                            <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</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Tools-PresentationMinimizer">
-                                <property name="visible">True</property>
-                                <property name="action_name">.uno:PresentationMinimizer</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Tools-Section-Presentation1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB84">
-                            <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>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin11">
-                                <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="Tools-BmpMask">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:BmpMask</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="belowspacing10">
-                                <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="Tools-AVMediaPlayer">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:AVMediaPlayer</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>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-6"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">3</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Tools-Section-Form">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator141">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom124">
-                            <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</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Tools-SwitchControlDesignMode">
-                                <property name="visible">True</property>
-                                <property name="action_name">.uno:SwitchControlDesignMode</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">4</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Tools-Section-Form1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB85">
-                            <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>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin18">
-                                <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="Tools-UseWizards1">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:UseWizards</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</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="belowspacing18">
-                                <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="Tools-GroupBox1">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:GroupBox</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</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>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-5"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">5</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Tools-Section-Form2">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator142">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="GroupB88">
-                            <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>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom125">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-Label">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:Label</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-Edit">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:Edit</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-CheckBox">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:CheckBox</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom126">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-RadioButton1">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:RadioButton</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-ListBox1">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:ListBox</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-ComboBox1">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:ComboBox</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</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>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-4"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">6</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Tools-Section-Form3">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator74">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="GroupB86">
-                            <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>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom127">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-NumericField1">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:NumericField</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-CurrencyField1">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:CurrencyField</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-PatternField1">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:PatternField</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom128">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-FormattedField">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:FormattedField</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-DateField">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:DateField</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-TimeField">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:TimeField</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-3"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">7</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Tools-Section-Form4">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator144">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="GroupB89">
-                            <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>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom129">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-Pushbutton">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:Pushbutton</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-Imagebutton">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:Imagebutton</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-ImageControl">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:ImageControl</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom130">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-FileControl">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:FileControl</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-NavigationBar">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:NavigationBar</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-Grid">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:Grid</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-2"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">8</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Tools-Section-Form5">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator76">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="GroupB91">
-                            <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>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom131">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-FormProperties">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:FormProperties</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-TabDialog">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:TabDialog</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-ControlProperties">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:ControlProperties</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom132">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-ShowFmExplorer">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:ShowFmExplorer</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-OpenReadOnly">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:OpenReadOnly</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-AutoControlFocus">
-                                    <property name="visible">True</property>
-                                    <property name="action_name">.uno:AutoControlFocus</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-1"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">9</property>
-                      </packing>
-                    </child>
                   </object>
                   <packing>
                     <property name="expand">True</property>
@@ -19429,29 +14986,29 @@
                 <child>
                   <object class="sfxlo-DropdownBox" id="Tools-Menu">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="halign">end</property>
                     <property name="valign">center</property>
                     <property name="vexpand">True</property>
                     <child>
                       <object class="GtkBox" id="ViewMenu3">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="valign">center</property>
                         <property name="vexpand">True</property>
                         <property name="orientation">vertical</property>
                         <child>
                           <object class="svtlo-ManagedMenuButton" id="Tools-ToolsButton:Menu Tools">
-                            <property name="label" translatable="yes" context="impressnotebookbar|ToolsMenuButton">_Tools</property>
+                            <property name="label" translatable="yes" context="TabbedImpress|ToolsMenuButton">_Tools</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="focus_on_click">False</property>
-                            <property name="receives_default">False</property>
+                            <property name="can-focus">True</property>
+                            <property name="focus-on-click">False</property>
+                            <property name="receives-default">False</property>
                             <property name="halign">end</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
                             <property name="relief">none</property>
-                            <property name="use_underline">True</property>
+                            <property name="use-underline">True</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -19462,16 +15019,17 @@
                         <child>
                           <object class="sfxlo-NotebookbarToolBox" id="SectionBottom149">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                            <property name="can-focus">True</property>
                             <property name="halign">end</property>
                             <property name="hexpand">True</property>
-                            <property name="toolbar_style">both-horiz</property>
-                            <property name="show_arrow">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
                             <property name="icon_size">1</property>
                             <child>
                               <object class="GtkToolButton" id="Tools-OptionsTreeDialog">
                                 <property name="visible">True</property>
-                                <property name="action_name">.uno:OptionsTreeDialog</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:OptionsTreeDialog</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -19496,27 +15054,10 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
-                    <property name="pack_type">end</property>
+                    <property name="pack-type">end</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
-                <child>
-                  <object class="GtkSeparator" id="separator85">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">end</property>
-                    <property name="margin_top">5</property>
-                    <property name="margin_bottom">5</property>
-                    <property name="orientation">vertical</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="padding">5</property>
-                    <property name="pack_type">end</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
               </object>
               <packing>
                 <property name="position">18</property>
@@ -19525,13 +15066,13 @@
             <child type="tab">
               <object class="GtkLabel" id="DevLabel">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="impressnotebookbar|DevLabel">~Tools</property>
-                <property name="use_underline">True</property>
+                <property name="can-focus">False</property>
+                <property name="label" translatable="yes" context="TabbedImpress|ToolsTabLabel">~Tools</property>
+                <property name="use-underline">True</property>
               </object>
               <packing>
                 <property name="position">18</property>
-                <property name="tab_fill">False</property>
+                <property name="tab-fill">False</property>
               </packing>
             </child>
           </object>
@@ -19543,29 +15084,19 @@
         </child>
       </object>
       <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">0</property>
+        <property name="left-attach">0</property>
+        <property name="top-attach">0</property>
       </packing>
     </child>
   </object>
-  <object class="GtkSizeGroup" id="1stRow">
-    <property name="mode">vertical</property>
-    <property name="ignore_hidden">True</property>
-    <widgets>
-      <widget name="LineA7"/>
-      <widget name="box76"/>
-      <widget name="GroupB16"/>
-      <widget name="GroupB95"/>
-    </widgets>
-  </object>
-  <object class="GtkSizeGroup" id="2ndRow">
-    <property name="mode">vertical</property>
-    <property name="ignore_hidden">True</property>
-    <widgets>
-      <widget name="LineB8"/>
-      <widget name="GroupB11"/>
-      <widget name="GroupB15"/>
-      <widget name="GroupB97"/>
-    </widgets>
+  <object class="GtkTreeStore" id="liststore1">
+    <columns>
+      <!-- column-name expander -->
+      <column type="GdkPixbuf"/>
+      <!-- column-name text -->
+      <column type="gchararray"/>
+      <!-- column-name id -->
+      <column type="gchararray"/>
+    </columns>
   </object>
 </interface>
diff --git a/solenv/sanitizers/ui/modules/simpress.suppr b/solenv/sanitizers/ui/modules/simpress.suppr
index fb3d3dda5b3b..d2379713bf95 100644
--- a/solenv/sanitizers/ui/modules/simpress.suppr
+++ b/solenv/sanitizers/ui/modules/simpress.suppr
@@ -25,5 +25,644 @@ sd/uiconfig/simpress/ui/presentationdialog.ui://GtkLabel[@id='external_str'] orp
 sd/uiconfig/simpress/ui/sidebarslidebackground.ui://GtkComboBoxText[@id='masterslide'] no-labelled-by
 sd/uiconfig/simpress/ui/sidebarslidebackground.ui://GtkLabel[@id='masterlabel'] orphan-label
 sd/uiconfig/simpress/ui/sidebarslidebackground.ui://GtkLabel[@id='customlabel'] orphan-label
-sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='Theme-ThemeColorsPane'] button-no-label
-
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnFileNewDoc'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnFileSaveAsTemplate'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnFileOpen'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnFileSave'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnFileExportTo'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnFileExportDirectToPDF'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnFileSendMail'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btFilePrint'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnFilePrintDefault'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnFileWebHtml'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnFileSetDocumentProperties'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnFileSignature'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnFileSignPDF'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnHomeCut'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnHomeCopy'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnHomeFormatPaintbrush'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnHomeSetDefault'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnHomeCharFontName'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnHomeFontHeight'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnHomeBold'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnHomeItalic'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnHomeUnderline'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnHomeStrikeout'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnHomeShadowed'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnHomeSubScript'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnHomeSuperScript'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnHomeGrow'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnHomeShrink'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnHomeDefaultBullet'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnHomeDefaultNumbering'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnHomeStartPara'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnHomeCenterPara'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnHomeRightPara'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnHomeJustifyPara'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnHomeIncrementIndent'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnHomeDecrementIndent'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnHomeHangingIndent'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnHomeParaLeftToRight'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnHomeParaRightToLeft'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnHomeParaspaceIncrease'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnHomeParaspaceDecrease'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='Home-SearchDialog'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='Home-Findbar'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnInsertInsertSlide'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnInsertDuplicatePage'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnInsertImportSlideFromFile'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnInsertInsertTable'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnInsertInsertObjectChart'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnInsertInsertObject'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnInsertInsertObjectStarMath'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnInsertInsertGraphic'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnInsertGallery'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnInsertInsertAVMedia'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnInsertCharmapControl'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnInsertVerticalText'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnInsertText'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnInsertHyperlinkDialog'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnInsertLine'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnInsertArrowsToolbox'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnInsertPolygon_Unfilled'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnInsertBezier_Unfilled'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnInsertObjects3DToolbox'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnInsertLineToolbox'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnInsertBasicShapes.rectangle'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnInsertBasicShapes.ellipse'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnInsertDrawCaption'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnInsertConnectorToolbox'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnInsertBasicShapes'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnInsertSymbolShapes'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnInsertArrowShapes'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnInsertStarShapes'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnInsertCalloutShapes'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnInsertFlowChartShapes'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='Insert-InsertGraphic1'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='Insert-Text1'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='Insert-InsertPage1'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnLayoutSlideSetup'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnLayoutHeaderAndFooter'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnLayoutMoveSlideUp'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnLayoutMoveSlideDown'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnLayoutHideSlide'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnLayoutShowSlide'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnLayoutRenameSlide'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnLayoutPresentationLayout'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnLayoutDisplayMasterBackground'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnLayoutDisplayMasterObjects'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnLayoutToggleObjectRotateMode'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnLayoutObjectAlign'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnLayoutObjectPosition'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='Slide-AssignLayout'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnDesignThemeColorsPanel'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnShowPresentation'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnShowPresentationCurrentSlide'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnShowRehearseTimings'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnShowCustomShowDialog'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnShowPresentationDialog'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnShowSlideChangeWindow'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnShowCustomAnimation'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnShowPresentationMinimizer'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnShowOutputQualityColor'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnShowOutputQualityGrayscale'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='SlideShowMenu-Presentation'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnReviewSpellDialog'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnReviewThesaurusDialog'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnReviewSpellOnline'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnReviewHyphenation'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnReviewInsertAnnotation'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnReviewNextAnnotation'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnReviewDeleteAnnotation'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnReviewPreviousAnnotation'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnReviewDeleteAllAnnotation'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnReviewShowAnnotations'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnReviewRedactDoc'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnReviewEditDoc'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='Review-AcceptTrackedChanges'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnViewNormalMultiPaneGUI'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnViewDiaMode'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnViewNotesMode'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnViewOutlineMode'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnViewSlideMasterPage'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnViewNotesMasterPage'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnViewHandoutMode'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnViewZoomMode'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnViewZoomPageWidth'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnViewZoomNext'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnViewZoomPage'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnViewZoomPrevious'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnViewSidebar'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnViewShowRuler'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnViewLeftPaneImpress'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnViewMenubar'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnViewToggleTabBarVisibility'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnViewDarkMode'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnViewCapturePoint'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnViewHelplinesVisible'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnViewSnapPoints'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnViewSnapBorder'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnViewGridUse'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnViewHelplinesUse'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnViewSnapFrame'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnViewGridVisible'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnViewHelplinesMove'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='View-Zoom'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnTableTransformDialog'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnTableSelectTable'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnTableEntireColumn'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnTableEntireRow'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnTableMergeCells'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnTableSplitCell'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnTableInsertColumnsBefore'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnTableInsertColumnsAfter'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnTableDeleteColumns'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnTableInsertRowsBefore'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnTableInsertRowsAfter'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnTableDeleteRows'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnTableOptimizeTable'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnTableTableDesign'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnTableFormatArea'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnTableFillStyle'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnTableLine'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnTableLineStyle'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnTableFrameLineColor'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='Table-TableDialog'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnImageCompressGraphic'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnImageCrop'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnImageToggleObjectRotateMode'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnImageFlipVertical'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnImageFlipHorizontal'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnImageTransformDialog'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnImageFormatArea'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnImageFillStyle'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnImageFormatLine'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnImageLineWidth'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnImageLineEndStyle'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnImageXLineColor'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnImageFillShadow'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnImageObjectAlignLeft'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnImageAlignCenter'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnImageObjectAlignRight'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnImageBringToFront'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnImageObjectForwardOne'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnImageAlignUp'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnImageAlignMiddle'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnImageAlignDown'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnImageSendToBack'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnImageObjectBackOne'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnImageGrafMode'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnImageColorSettings'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='Image-FormatArea'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='Image-FormatLine'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='Image-TransformDialog'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnDrawTransformDialog'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnDrawToggleObjectBezierMode'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnDrawToggleObjectRotateMode'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnDrawFlipVertical'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnDrawFlipHorizontal'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnDrawShear'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnDrawCrookSlant'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnDrawFormatArea'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnDrawFillStyle'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnDrawFormatLine'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnDrawLineWidth'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnDrawLineEndStyle'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnDrawXLineColor'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnDrawFillShadow'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnDrawObjectAlignLeft'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnDrawAlignCenter'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnDrawObjectAlignRight'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnDrawBringToFront'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnDrawObjectForwardOne'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnDrawAlignUp'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnDrawAlignMiddle'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnDrawAlignDown'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnDrawSendToBack'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnDrawObjectBackOne'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnDrawFormatGroup'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnDrawEnterGroup'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnDrawLeaveGroup'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnDrawExtrusionToggle'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnDrawExtrusionDepthFloater'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnDrawExtrusionDirectionFloater'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='Draw-FormatArea'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='Draw-FormatLine'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='Draw-TransformDialog'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnObjectToggleObjectRotateMode'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnObjectFlipVertical'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnObjectFlipHorizontal'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnObjectTransformDialog'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnObjectOriginalSize'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnObjectFormatArea'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnObjectFillStyle'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnObjectFormatLine'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnObjectLineWidth'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnObjectLineEndStyle'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnObjectXLineColor'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnObjectFillShadow'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnObjectObjectAlignLeft'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnObjectAlignCenter'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnObjectObjectAlignRight'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnObjectBringToFront'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnObjectObjectForwardOne'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnObjectAlignUp'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnObjectAlignMiddle'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnObjectAlignDown'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnObjectSendToBack'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnObjectObjectBackOne'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='Object-FormatArea'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='Object-FormatLine'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='Object-TransformDialog'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnMediaTransformDialog'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnMediaObjectAlignLeft'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnMediaAlignCenter'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnMediaObjectAlignRight'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnMediaBringToFront'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnMediaObjectForwardOne'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnMediaAlignUp'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnMediaAlignMiddle'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnMediaAlignDown'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnMediaSendToBack'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnMediaObjectBackOne'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnMediaAVMediaToolBox'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnMediaAVMediaPlayer'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='Media-FormatArea'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='Media-FormatLine'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='Media-TransformDialog'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnFormTransformDialog'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnFormUseWizards'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnFormGroupBox'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnFormFormProperties'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnFormShowFmExplorer'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnFormTabDialog'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnFormOpenReadOnly'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnFormControlProperties'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnFormAutoControlFocus'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnFormLabel'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnFormEdit'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnFormCheckBox'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnFormRadioButton'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnFormListBox'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnFormComboBox'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnFormNumericField'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnFormCurrencyField'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnFormPatternField'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnFormFormattedField'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnFormDateField'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnFormTimeField'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnFormPushbutton'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnFormImagebutton'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnFormImageControl'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnFormFileControl'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnFormNavigationBar'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnFormGrid'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='FormMenu-FormProperties'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnMasterRenameMasterPage'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnMasterDeleteMasterPage'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnMasterInsertMasterPage'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnMasterNotesMasterPage'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnMasterHandoutMode'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnMasterMasterLayouts'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnMasterSlideSetup'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnMasterSelectBackground'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnMasterSaveBackground'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnMasterHideSlide'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnMasterShowSlide'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnMasterCloseMasterView'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='MasterPageMenu-PageSetup'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnOutlineNormalMultiPaneGUI'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnOutlineDiaMode'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnOutlineNotesMode'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnOutlineOutlineMode'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnOutlineOutlineFormat'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnOutlineOutlineRight'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnOutlineOutlineLeft'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnOutlineOutlineUp'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnOutlineOutlineDown'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnOutlineOutlineCollapseAll'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnOutlineOutlineExpandAll'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnOutlineOutlineCollapse'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnOutlineOutlineExpand'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='OutlineMenu-NormalMultiPaneGUI'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btn3DTransformDialog'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btn3DToggleObjectBezierMode'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btn3DToggleObjectRotateMode'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btn3DFlipVertical'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btn3DFlipHorizontal'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btn3DShear'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btn3DCrookSlant'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btn3DFormatArea'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btn3DFillStyle'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btn3DFormatLine'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btn3DLineWidth'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btn3DLineEndStyle'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btn3DXLineColor'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btn3DFillShadow'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btn3DObjectAlignLeft'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btn3DAlignCenter'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btn3DObjectAlignRight'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btn3DbringToFront'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btn3DObjectForwardOne'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btn3DAlignUp'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btn3DAlignMiddle'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btn3DAlignDown'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btn3DSendToBack'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btn3DObjectBackOne'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btn3DWindow3D'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='Draw-FormatArea5'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='Draw-FormatLine5'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='Draw-TransformDialog1'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnToolsRunMacro'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnToolsBasicIDEAppear'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnToolsMacroDialog'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='Tools-OptionsTreeDialog'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuToolButton[@id='btnFileAddDirect'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuToolButton[@id='btnHomePaste'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuToolButton[@id='btnHomeSpacing'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuToolButton[@id='btnHomeBackColor'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuToolButton[@id='btnHomeColor'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuToolButton[@id='btnHomeLineSpacing'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuToolButton[@id='btnTableSetBorderStyle'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuToolButton[@id='btnImageXLineStyle'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuToolButton[@id='btnImageGraphicFilterToolbox'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuToolButton[@id='btnImageGrafLuminance'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuToolButton[@id='btnImageGrafContrast'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuToolButton[@id='btnImageGrafTransparence'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuToolButton[@id='btnImageGrafGamma'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuToolButton[@id='btnDrawXLineStyle'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuToolButton[@id='btnDrawExtrusion3DColor'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuToolButton[@id='btnDrawExtrusionSurfaceFloater'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuToolButton[@id='btnObjectXLineStyle'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuToolButton[@id='btn3DXLineStyle'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='Menu-Extension-PackageManagerDialog'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuConvert-ChangeBezier'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuConvert-ChangePolygon'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuConvert-convert_to_contour'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuConvert-ConvertInto3'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuConvert-ConvertInto3DLatheFast'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuConvert-ConvertIntoBitmap'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuConvert-ConvertIntoMetaFile'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuDraw-ToggleObjectBezierMode'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuDraw-ToggleObjectRotateMode'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuDraw-MirrorVert'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuDraw-MirrorHorz'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuDraw-AdvancedMode'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuDraw-Combine'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuDraw-Dismantle'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuDraw-Merge'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuDraw-Substract'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuDraw-Intersect'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuDraw-EqualizeWidth'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuDraw-EqualizeHeight'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuDraw-Connect'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuDraw-Break'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuDraw-CopyObjects'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuDraw-Morphing'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuDraw-ChangeBezier'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuDraw-ChangePolygon'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuDraw-convert_to_contour'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuDraw-ConvertInto3D'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuDraw-ConvertInto3DLatheFast'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuDraw-ConvertIntoBitmap'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuDraw-ConvertIntoMetaFile'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuDraw-NameGroup'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuDraw-ObjectTitleDescription'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuField-InsertDateFieldFix'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuField-InsertDateFieldVar'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuField-InsertTimeFieldFix'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuField-InsertTimeFieldVar'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuField-InsertAuthorField'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuField-InsertSlideField'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuField-InsertSlideTitleField'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuField-InsertSlidesField'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuField-InsertFileField'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuFile-AddDirect'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuFile-RecentFileList'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuFile-CloseDoc'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuFile-Save'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuFile-SaveAs'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuFile-SaveAsRemote'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuFile-SaveACopy'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuFile-Reload'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuFile-ExportTo'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuFile-ExportToPDF'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuFile-SendMail'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuFile-SendMailDocAsPDF'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuFile-SendViaBluetooth'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuFile-WebHtml'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuFile-Print'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuFile-PrintDefault'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuFile-PrinterSetup'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuFile-Signature'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuFile-SignPDF'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuFile-SetDocumentProperties'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuFile-Quit'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuForm-Label'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuForm-Edit'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuForm-CheckBox'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuForm-RadioButton'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuForm-ListBox'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuForm-ComboBox'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuForm-Pushbutton'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuForm-Imagebutton'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuForm-FormattedField'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuForm-DateField'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuForm-TimeField'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuForm-NumericField'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuForm-CurrencyField'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuForm-PatternField'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuForm-ImageControl'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuForm-FileControl'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuForm-Grid'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuForm-NavigationBar'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuHelp-HelpIndex'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuHelp-ExtendedHelp'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuHelp-Documentation'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuHelp-QuestionAnswers'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuHelp-SendFeedback'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuHelp-SafeMode'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuHelp-GetInvolved'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuHelp-Donation'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuHelp-ShowLicense'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuHelp-About'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuHome-Shadowed'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuHome-OutlineFont'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuHome-Overline'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuHome-ChangeCaseToUpper'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuHome-ChangeCaseToLower'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuHome-ChangeCaseRotateCase'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuHome-ChangeCaseToSentenceCase'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuHome-ChangeCaseToTitleCase'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuHome-ChangeCaseToToggleCase'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuHome-InsertNonBreakingSpace'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuHome-InsertHardHyphen'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuHome-InsertSoftHyphen'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuHome-InsertZWSP'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuHome-InsertWJ'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuHome-InsertLRM'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuHome-InsertRLM'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuHome-FontDialog'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuHome-ParagraphDialog'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuHome-SelectAll'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuHome-FocusToFindbar'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuHome-SearchDialog'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuHome-RestoreEditingView'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuImage-ImageCrop'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuImage-ExternalEdit'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuImage-ChangePicture'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuImage-CompressGraphic'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuImage-SaveGraphic'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuImage-OriginalSize'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuImage-ImageMapDialog'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuImage-NameGroup'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuImage-ObjectTitleDescription'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuImage-AnimationEffects'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuInsert-PhotoAlbumDialog'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuInsert-AnimationObjects'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuInsert-Gallery'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuInsert-TwainSelect'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuInsert-InsertAVMedia'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuInsert-InsertQrCode'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuInsert-InsertObject'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuInsert-ImportFromFile'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuInsert-InsertMath'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuInsert-DrawText'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuInsert-VerticalText'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuInsert-FontworkGalleryFloater'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuInsert-HyperlinkDialog'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuInsert-CapturePoint'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuInsert-InsertPageField'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuInsert-InsertPagesField'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuInsert-HeaderAndFooter'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='InsertMasterPageD1'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='RenameMasterPageD1'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='DeleteMasterPageD1'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='CloseMasterViewD1'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuMedia-AVMediaPlayer'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuMedia-NameGroup'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuMedia-ObjectTitleDescription'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuMedia-AnimationEffects'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuObject-ChainFrames'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuObject-UnhainFrames'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuObject-NameGroup'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuObject-ObjectTitleDescription'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuObject-FrameDialog'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuReference-InsertFootnoteDialog'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuReference-AddressBookSource'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuReference-UpdateAll'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuReference-Repaginate'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuReference-UpdateFields'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuReference-UpdateAllIndexes'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuReference-UpdateCurIndex'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuReference-UpdateAllLinks'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuReference-UpdateCharts'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuReference-CalculateSel'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuReview-SpellDialog'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuReview-SpellOnline'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuReview-ThesaurusDialog'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuReview-SetLanguageAllTextMenu'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuReview-Hyphenation'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuReview-ChineseConversion'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuReview-HangulHanjaConversion'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuReview-MoreDictionaries'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuSlide-InsertSlide'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuSlide-DuplicateSlide'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuSlide-DeleteSlide'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuSlide-ModifyPage'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuSlide-SlideSetup'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuSlide-SelectBackground'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuSlide-InsertMasterPage'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuSlide-DeleteMasterPage'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuSlide-PresentationLayout'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuSlide-DisplayMasterBackground'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuSlide-DisplayMasterObjects'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuSlide-HideSlide'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuSlide-ShowSlide'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuSlide-RenameSlide'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuSlide-ImportSlideFromFile'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuSlide-SummaryPage'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuSlide-ExpandPage'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuSlide-MoveSlideUp'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuSlide-MoveSlideDown'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuSlideShow-Presentation'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuSlideShow-PresentationCurrentSlide'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuSlideShow-RehearseTimings'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuSlideShow-CustomShowDialog'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuSlideShow-Remote'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuSlideShow-SlideChangeWindow'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuSlideShow-CustomAnimation'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuSlideShow-PresentationMinimizer'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuSlideShow-PresentationDialog'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuTable-AutoFormat'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuTable-ObjectAlign'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuTable-InsertRowDialog'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuTable-InsertColumnDialog'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuTable-SetRowHeight'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuTable-SetOptimalRowHeight'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuTable-DistributeRows'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuTable-SetColumnWidth'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuTable-SetOptimalColumnWidth'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuTable-DistributeColumns'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuTable-Protect'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuTable-UnsetCellsReadOnly'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuTable-HeadingRowsRepeat'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuTable-RowSplit'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuTable-ConvertTextToTable'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuTable-ConvertTableToText'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuTable-TableSort'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuTable-MergeTable'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuTable-TableNumberRecognition'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuTable-TableBoundaries'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuTools-MacroRecorder'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuTools-RunMacro'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuTools-BasicIDEAppear'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuTools-MacroOrganizer'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuTools-ScriptOrganizer'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuTools-MacroSignature'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuTools-DevTools'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuTools-PresentationMinimizer'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuTools-BmpMask'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuTools-AVMediaPlayer'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuTools-ViewDataSourceBrowser'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuTools-OpenXMLFilterSettings'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuView-Menubar'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuView-Sidebar'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuView-StatusBarVisible'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuView-LeftPaneImpress'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuView-ToggleTabBarVisibility'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuView-ShowRuler'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuView-GridUse'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuView-GridFront'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuView-HelplinesVisible'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuView-HelplinesUse'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuView-ZoomPage'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkMenuItem[@id='MenuView-Zoom100Percent'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkRadioMenuItem[@id='MenuHome-ParaLeftToRight'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkRadioMenuItem[@id='MenuHome-ParaRightToLeft'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkRadioMenuItem[@id='MenuSlideShow-OutputQualityColor'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkRadioMenuItem[@id='MenuSlideShow-OutputQualityGrayscale'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkRadioMenuItem[@id='MenuView-NormalMultiPaneGUI'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkRadioMenuItem[@id='MenuView-OutlineMode'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkRadioMenuItem[@id='MenuView-NotesMode'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkRadioMenuItem[@id='MenuView-DiaMode'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkRadioMenuItem[@id='MenuView-SlideMasterPage'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkRadioMenuItem[@id='MenuView-NotesMasterPage'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkRadioMenuItem[@id='MenuView-HandoutMode'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkRadioMenuItem[@id='MenuView-OutputQualityColor'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkRadioMenuItem[@id='MenuView-OutputQualityGrayscale'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnInsertFontworkGalleryFloater'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnInsertFontworkShapeType'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnInsertFontworkSameLetterHeights'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnInsertFontworkAlignmentFloater'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnInsertFontworkCharacterSpacingFloater'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnDrawCombine'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnDrawIntersect'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnDrawDismantle'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnDrawMerge'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnDrawSubstract'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnDrawDistributeSelection'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnDrawFormatUngroup'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnHomeInsertSlide'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnHomeDuplicatePage'] button-no-label
+sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnHomePresentationLayout'] button-no-label