NB: update writer groupedbar_full

Change-Id: I4fffde4c7ee687af1eb1c7f5eb28be16bb369e28
Reviewed-on: https://gerrit.libreoffice.org/64386
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a@gmail.com>

1 files changed, 754 insertions, 728 deletions

diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
index 70f564408f66..7b33cf1ae963 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.22.1 -->
 <interface domain="sw">
   <requires lib="gtk+" version="3.18"/>
   <requires lib="LibreOffice" version="1.0"/>
@@ -7,187 +7,119 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="ExtrusionToggleD1">
+      <object class="GtkMenuItem" id="Menu3D-ExtrusionToggle">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ExtrusionToggle</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator138">
+      <object class="GtkSeparatorMenuItem" id="Menu3D-separator1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ExtrusionTiltDownD">
+      <object class="GtkMenuItem" id="Menu3D-ExtrusionTiltDown">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ExtrusionTiltDown</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ExtrusionTiltUpD">
+      <object class="GtkMenuItem" id="Menu3D-ExtrusionTiltUp">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ExtrusionTiltUp</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ExtrusionTiltLeftD">
+      <object class="GtkMenuItem" id="Menu3D-ExtrusionTiltLeft">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ExtrusionTiltLeft</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ExtrusionTiltRightD">
+      <object class="GtkMenuItem" id="Menu3D-ExtrusionTiltRight">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ExtrusionTiltRight</property>
       </object>
     </child>
   </object>
-  <object class="GtkMenu" id="MenuAlign">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <child>
-      <object class="GtkMenuItem" id="ObjectAlignLeftD1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ObjectAlignLeft</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="AlignCenterD1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:AlignCenter</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="ObjectAlignRightD1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ObjectAlignRight</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="separator143">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="AlignUpD1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:AlignUp</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="AlignMiddleD1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:AlignMiddle</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="AlignDownD1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:AlignDown</property>
-      </object>
-    </child>
-  </object>
   <object class="GtkMenu" id="MenuArrange">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="WrapOffD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:WrapOff</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="WrapOnD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:WrapOn</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="WrapIdealD">
+      <object class="GtkMenuItem" id="MenuArrange-AnchorMenu">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:WrapIdeal</property>
+        <property name="action_name">.uno:AnchorMenu</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="WrapLeftD">
+      <object class="GtkSeparatorMenuItem" id="MenuArrange-separator">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:WrapLeft</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="WrapRightD">
+      <object class="GtkMenuItem" id="MenuArrange-WrapThrough">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:WrapRight</property>
+        <property name="action_name">.uno:WrapThrough</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="WrapThroughD">
+      <object class="GtkMenuItem" id="MenuArrange-WrapThroughTransparent">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:WrapThrough</property>
+        <property name="action_name">.uno:WrapThroughTransparent</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="WrapThroughTransparentD">
+      <object class="GtkSeparatorMenuItem" id="MenuArrange-separator1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:WrapThroughTransparent</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="WrapContourD">
+      <object class="GtkMenuItem" id="MenuArrange-WrapContour">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:WrapContour</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="WrapAnchorOnlyD">
+      <object class="GtkMenuItem" id="MenuArrange-WrapAnchorOnly">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:WrapAnchorOnly</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="TextWrapD">
+      <object class="GtkMenuItem" id="MenuArrange-TextWrap">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:TextWrap</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator132">
+      <object class="GtkSeparatorMenuItem" id="MenuArrange-separator2">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SetObjectToForegroundD">
+      <object class="GtkMenuItem" id="MenuArrange-SetObjectToForeground">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:SetObjectToForeground</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SetObjectToBackgroundD">
+      <object class="GtkMenuItem" id="MenuArrange-SetObjectToBackground">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:SetObjectToBackground</property>
@@ -198,81 +130,61 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="TableSortD">
+      <object class="GtkMenuItem" id="MenuCalculate-TableSort">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:TableSort</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator53">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="InsertFormulaD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertFormula</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="AutoSumD">
+      <object class="GtkSeparatorMenuItem" id="MenuCalculate-separator1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:AutoSum</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator55">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="NumberFormatStandardD">
+      <object class="GtkMenuItem" id="MenuCalculate-NumberFormatStandard">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:NumberFormatStandard</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="NumberFormatCurrencyD">
+      <object class="GtkMenuItem" id="MenuCalculate-NumberFormatCurrency">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:NumberFormatCurrency</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="NumberFormatPercentD">
+      <object class="GtkMenuItem" id="MenuCalculate-NumberFormatPercent">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:NumberFormatPercent</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="NumberFormatDecimalD">
+      <object class="GtkMenuItem" id="MenuCalculate-NumberFormatDecimal">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:NumberFormatDecimal</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="NumberFormatDateD">
+      <object class="GtkMenuItem" id="MenuCalculate-NumberFormatDate">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:NumberFormatDate</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator56">
+      <object class="GtkSeparatorMenuItem" id="MenuCalculate-separator2">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="TableNumberFormatDialogD">
+      <object class="GtkMenuItem" id="MenuCalculate-TableNumberFormatDialog">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:TableNumberFormatDialog</property>
@@ -283,129 +195,142 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="GraphicFilterSepiaD">
+      <object class="GtkMenuItem" id="MenuColor-GraphicFilterSepia">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:GraphicFilterSepia</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="GraphicFilterSobelD">
+      <object class="GtkMenuItem" id="MenuColor-GraphicFilterSobel">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:GraphicFilterSobel</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="GraphicFilterInvertD">
+      <object class="GtkMenuItem" id="MenuColor-GraphicFilterInvert">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:GraphicFilterInvert</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="GraphicFilterMosaicD">
+      <object class="GtkMenuItem" id="MenuColor-GraphicFilterMosaic">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:GraphicFilterMosaic</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="GraphicFilterPopart">
+      <object class="GtkMenuItem" id="MenuColor-GraphicFilterPopart">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:GraphicFilterPopart</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="GraphicFilterPosterD">
+      <object class="GtkMenuItem" id="MenuColor-GraphicFilterPoster">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:GraphicFilterPoster</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="GraphicFilterReliefD">
+      <object class="GtkMenuItem" id="MenuColor-GraphicFilterRelief">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:GraphicFilterRelief</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="GraphicFilterRemoveNoiseD">
+      <object class="GtkMenuItem" id="MenuColor-GraphicFilterRemoveNoise">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:GraphicFilterRemoveNoise</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="GraphicFilterSharpenD">
+      <object class="GtkMenuItem" id="MenuColor-GraphicFilterSharpen">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:GraphicFilterSharpen</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="GraphicFilterSmoothD">
+      <object class="GtkMenuItem" id="MenuColor-GraphicFilterSmooth">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:GraphicFilterSmooth</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="GraphicFilterSolarizeD">
+      <object class="GtkMenuItem" id="MenuColor-GraphicFilterSolarize">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:GraphicFilterSolarize</property>
       </object>
     </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="MenuColor-separator1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuColor-GrafMode">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:GrafMode</property>
+      </object>
+    </child>
   </object>
   <object class="GtkMenu" id="MenuComments">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="InsertCommentD">
+      <object class="GtkMenuItem" id="MenuComments-InsertComment">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertAnnotation</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertCommentD1">
+      <object class="GtkMenuItem" id="MenuComments-ShowAnnotations">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ShowAnnotations</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator108">
+      <object class="GtkSeparatorMenuItem" id="MenuComments-separator1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ReplyCommentD">
+      <object class="GtkMenuItem" id="MenuComments-ReplyComment">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ReplyComment</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="DeleteCommentD">
+      <object class="GtkMenuItem" id="MenuComments-DeleteComment">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:DeleteComment</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="DeleteAuthorD">
+      <object class="GtkMenuItem" id="MenuComments-DeleteAuthor">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:DeleteAuthor</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="DeleteAllNotesD">
+      <object class="GtkMenuItem" id="MenuComments-DeleteAllNotes">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:DeleteAllNotes</property>
@@ -416,27 +341,27 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="ReplyCommentD1">
+      <object class="GtkMenuItem" id="MenuCompare-ReplyComment">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ProtectTraceChangeMode</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator115">
+      <object class="GtkSeparatorMenuItem" id="MenuCompare-separator1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="CompareDocumentsD">
+      <object class="GtkMenuItem" id="MenuCompare-CompareDocuments">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:CompareDocuments</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MergeDocuments">
+      <object class="GtkMenuItem" id="MenuCompare-MergeDocuments">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:MergeDocuments</property>
@@ -447,185 +372,192 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="LineD">
+      <object class="GtkMenuItem" id="MenuDraw-Line">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:Line</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="Freeline_UnfilledD">
+      <object class="GtkMenuItem" id="MenuDraw-Freeline_Unfilled">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:Freeline_Unfilled</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="FreelineD">
+      <object class="GtkMenuItem" id="MenuDraw-Freeline">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:Freeline</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="Bezier_UnfilledD">
+      <object class="GtkMenuItem" id="MenuDraw-Bezier_Unfilled">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:Bezier_Unfilled</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="BezierFillD">
+      <object class="GtkMenuItem" id="MenuDraw-BezierFill">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:BezierFill</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="Polygon_UnfilledD">
+      <object class="GtkMenuItem" id="MenuDraw-Polygon_Unfilled">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:Polygon_Unfilled</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="Polygon_Diagonal_UnfilledD">
+      <object class="GtkMenuItem" id="MenuDraw-Polygon_Diagonal_Unfilled">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:Polygon_Diagonal_Unfilled</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="Polygon_DiagonalD">
+      <object class="GtkMenuItem" id="MenuDraw-Polygon_Diagonal">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:Polygon_Diagonal</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator131">
+      <object class="GtkSeparatorMenuItem" id="MenuDraw-separator1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="BasicShapesD">
+      <object class="GtkMenuItem" id="MenuDraw-BasicShapes">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:BasicShapes</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SymbolShapesD">
+      <object class="GtkMenuItem" id="MenuDraw-SymbolShapes">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:SymbolShapes</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ArrowShapesD">
+      <object class="GtkMenuItem" id="MenuDraw-ArrowShapes">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ArrowShapes</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="StarShapesD">
+      <object class="GtkMenuItem" id="MenuDraw-StarShapes">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:StarShapes</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="CalloutShapesD">
+      <object class="GtkMenuItem" id="MenuDraw-CalloutShapes">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:CalloutShapes</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="FlowChartShapesD">
+      <object class="GtkMenuItem" id="MenuDraw-FlowChartShapes">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:FlowChartShapes</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator134">
+      <object class="GtkSeparatorMenuItem" id="MenuDraw-separator2">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="DrawCaptionD">
+      <object class="GtkMenuItem" id="MenuDraw-DrawCaption">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:DrawCaption</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="VerticalCaptionD">
+      <object class="GtkMenuItem" id="MenuDraw-VerticalCaption">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:VerticalCaption</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator135">
+      <object class="GtkSeparatorMenuItem" id="MenuDraw-separator3">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="DrawText3">
+      <object class="GtkMenuItem" id="MenuDraw-AddTextBox">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:AddTextBox</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuDraw-DrawText">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:DrawText</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="VerticalTextD">
+      <object class="GtkMenuItem" id="MenuDraw-VerticalText">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:VerticalText</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertGraphicD2">
+      <object class="GtkMenuItem" id="MenuDraw-InsertGraphic">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertGraphic</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="FontworkGalleryFloaterD1">
+      <object class="GtkMenuItem" id="MenuDraw-FontworkGalleryFloater">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:FontworkGalleryFloater</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="Text_MarqueeD">
+      <object class="GtkMenuItem" id="MenuDraw-Text_Marquee">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:Text_Marquee</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator136">
+      <object class="GtkSeparatorMenuItem" id="MenuDraw-separator4">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ToggleObjectBezierModeD">
+      <object class="GtkMenuItem" id="MenuDraw-ToggleObjectBezierMode">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ToggleObjectBezierMode</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ExtrusionToggleD">
+      <object class="GtkMenuItem" id="MenuDraw-ExtrusionToggle">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ExtrusionToggle</property>
@@ -636,95 +568,102 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="SelectObjectD">
+      <object class="GtkMenuItem" id="MenuDrawEdit-SelectObject">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:SelectObject</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ToggleObjectRotateModeD">
+      <object class="GtkMenuItem" id="MenuDrawEdit-ToggleObjectRotateMode">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ToggleObjectRotateMode</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator129">
+      <object class="GtkMenuItem" id="MenuDrawEdit-ToggleObjectBezierMode">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:ToggleObjectBezierMode</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="FlipVerticald">
+      <object class="GtkSeparatorMenuItem" id="MenuDrawEdit-separator1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuDrawEdit-FlipVerticald">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:FlipVertical</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="FlipHorizontalD1">
+      <object class="GtkMenuItem" id="MenuDrawEdit-FlipHorizontal">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:FlipHorizontal</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator120">
+      <object class="GtkSeparatorMenuItem" id="MenuDrawEdit-separator2">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="TransformDialogD">
+      <object class="GtkMenuItem" id="MenuDrawEdit-TransformDialog">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:TransformDialog</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="FormatLineD">
+      <object class="GtkMenuItem" id="MenuDrawEdit-FormatLine">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:FormatLine</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="FormatAreaD">
+      <object class="GtkMenuItem" id="MenuDrawEdit-FormatArea">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:FormatArea</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="TextAttributesD">
+      <object class="GtkMenuItem" id="MenuDrawEdit-TextAttributes">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:TextAttributes</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="FontWorkD">
+      <object class="GtkMenuItem" id="MenuDrawEdit-FontWork">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:FontWork</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator133">
+      <object class="GtkSeparatorMenuItem" id="MenuDrawEdit-separator3">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="FontWorkD1">
+      <object class="GtkMenuItem" id="MenuDrawEdit-AddTextBox">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:AddTextBox</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="RemoveTextBoxD">
+      <object class="GtkMenuItem" id="MenuDrawEdit-RemoveTextBox">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:RemoveTextBox</property>
@@ -735,150 +674,150 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="undoi2">
+      <object class="GtkMenuItem" id="MenuEdit-Undo">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:Undo</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="redod2">
+      <object class="GtkMenuItem" id="MenuEdit-Redo">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:Redo</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="repeati2">
+      <object class="GtkMenuItem" id="MenuEdit-Repeat">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:Repeat</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator65">
+      <object class="GtkSeparatorMenuItem" id="MenuEdit-separator1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="cutd2">
+      <object class="GtkMenuItem" id="MenuEdit-Cut">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:Cut</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="copyd2">
+      <object class="GtkMenuItem" id="MenuEdit-Copy">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:Copy</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="pasted2">
+      <object class="GtkMenuItem" id="MenuEdit-Paste">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:Paste</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="pastespeciald2">
+      <object class="GtkMenuItem" id="MenuEdit-PasteUnformatted">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:PasteSpecial</property>
+        <property name="action_name">.uno:PasteUnformatted</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="pasteunformatted2">
+      <object class="GtkMenuItem" id="MenuEdit-PasteSpecial">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:PasteUnformatted</property>
+        <property name="action_name">.uno:PasteSpecial</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator66">
+      <object class="GtkSeparatorMenuItem" id="MenuEdit-separator2">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SelectAlld2">
+      <object class="GtkMenuItem" id="MenuEdit-SelectAll">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:SelectAll</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SelectionModeDefaultD2">
+      <object class="GtkMenuItem" id="MenuEdit-SelectionModeDefault">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:SelectionModeDefault</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SelectionModeBlockD2">
+      <object class="GtkMenuItem" id="MenuEdit-SelectionModeBlock">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:SelectionModeBlock</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SelectTextModeD2">
+      <object class="GtkMenuItem" id="MenuEdit-SelectTextMode">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:SelectTextMode</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ShadowCursorD2">
+      <object class="GtkMenuItem" id="MenuEdit-ShadowCursor">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ShadowCursor</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator67">
+      <object class="GtkSeparatorMenuItem" id="MenuEdit-separator3">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="FocusToFindbarD2">
+      <object class="GtkMenuItem" id="MenuEdit-FocusToFindbar">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">vnd.sun.star.findbar:FocusToFindbar</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SearchDialogD2">
+      <object class="GtkMenuItem" id="MenuEdit-SearchDialog">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:SearchDialog</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="GotoPageD2">
+      <object class="GtkMenuItem" id="MenuEdit-GotoPage">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:GotoPage</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator68">
+      <object class="GtkSeparatorMenuItem" id="MenuEdit-separator4">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="Watermark">
+      <object class="GtkMenuItem" id="MenuEdit-Watermark">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:Watermark</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="PageDialog">
+      <object class="GtkMenuItem" id="MenuEdit-PageDialog">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:PageDialog</property>
@@ -889,176 +828,176 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="AddDirectD">
+      <object class="GtkMenuItem" id="MenuFile-AddDirect">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:AddDirect</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="RecentFileListD">
+      <object class="GtkMenuItem" id="MenuFile-RecentFileList">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:RecentFileList</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="CloseDocD">
+      <object class="GtkMenuItem" id="MenuFile-CloseDoc">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:CloseDoc</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator39">
+      <object class="GtkSeparatorMenuItem" id="MenuFile-separator">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SaveD">
+      <object class="GtkMenuItem" id="MenuFile-Save">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:Save</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SaveAsD">
+      <object class="GtkMenuItem" id="MenuFile-SaveAs">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:SaveAs</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SaveAsRemoteD">
+      <object class="GtkMenuItem" id="MenuFile-SaveAsRemote">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:SaveAsRemote</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="NewGlobalDocD">
+      <object class="GtkMenuItem" id="MenuFile-NewGlobalDoc">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:NewGlobalDoc</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator61">
+      <object class="GtkSeparatorMenuItem" id="MenuFile-separator1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ExportToD">
+      <object class="GtkMenuItem" id="MenuFile-ExportTo">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ExportTo</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ExportToPDFD">
+      <object class="GtkMenuItem" id="MenuFile-ExportToPDF">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ExportToPDF</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ExportToEPUBD">
+      <object class="GtkMenuItem" id="MenuFile-ExportToEPUB">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ExportToEPUB</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator44">
+      <object class="GtkSeparatorMenuItem" id="MenuFile-separator2">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SendMailD">
+      <object class="GtkMenuItem" id="MenuFile-SendMail">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:SendMail</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SendMailDocAsPDFD">
+      <object class="GtkMenuItem" id="MenuFile-SendMailDocAsPDF">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:SendMailDocAsPDF</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SendViaBluetoothD">
+      <object class="GtkMenuItem" id="MenuFile-SendViaBluetooth">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:SendViaBluetooth</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator48">
+      <object class="GtkSeparatorMenuItem" id="MenuFile-separator3">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="PrintPreviewD">
+      <object class="GtkMenuItem" id="MenuFile-PrintPreview">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:PrintPreview</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="PrintDefaultD">
+      <object class="GtkMenuItem" id="MenuFile-PrintDefault">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:PrintDefault</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="PrinterSetupD">
+      <object class="GtkMenuItem" id="MenuFile-PrinterSetup">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:PrinterSetup</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator50">
+      <object class="GtkSeparatorMenuItem" id="MenuFile-separator4">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SignatureD">
+      <object class="GtkMenuItem" id="MenuFile-Signature">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:Signature</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SignPDFD">
+      <object class="GtkMenuItem" id="MenuFile-SignPDF">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:SignPDF</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SetDocumentPropertiesD">
+      <object class="GtkMenuItem" id="MenuFile-SetDocumentProperties">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:SetDocumentProperties</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator42">
+      <object class="GtkSeparatorMenuItem" id="separator39">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="QuitD">
+      <object class="GtkMenuItem" id="MenuFile-Quit">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:Quit</property>
@@ -1069,183 +1008,183 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="GrowD">
+      <object class="GtkMenuItem" id="MenuFormat-Grow">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:Grow</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ShrinkD">
+      <object class="GtkMenuItem" id="MenuFormat-Shrink">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:Shrink</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator72">
+      <object class="GtkSeparatorMenuItem" id="MenuFormat-separator1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ShadowedD">
+      <object class="GtkMenuItem" id="MenuFormat-Shadowed">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:Shadowed</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="OutlineFontD">
+      <object class="GtkMenuItem" id="MenuFormat-OutlineFont">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:OutlineFont</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="OverlineD">
+      <object class="GtkMenuItem" id="MenuFormat-Overline">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:Overline</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator52">
+      <object class="GtkSeparatorMenuItem" id="MenuFormat-separator2">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SuperScript1">
+      <object class="GtkMenuItem" id="MenuFormat-SuperScript">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:SuperScript</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SubScriptD">
+      <object class="GtkMenuItem" id="MenuFormat-SubScript">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:SubScript</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator21">
+      <object class="GtkSeparatorMenuItem" id="MenuFormat-separator3">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ChangeCaseToUpperD">
+      <object class="GtkMenuItem" id="MenuFormat-ChangeCaseToUpper">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ChangeCaseToUpper</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ChangeCaseToLowerD">
+      <object class="GtkMenuItem" id="MenuFormat-ChangeCaseToLower">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ChangeCaseToLower</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ChangeCaseRotateCaseD">
+      <object class="GtkMenuItem" id="MenuFormat-ChangeCaseRotateCase">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ChangeCaseRotateCase</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator54">
+      <object class="GtkSeparatorMenuItem" id="MenuFormat-separator4">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ChangeCaseToSentenceCaseD">
+      <object class="GtkMenuItem" id="MenuFormat-ChangeCaseToSentenceCase">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ChangeCaseToSentenceCase</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ChangeCaseToTitleCaseD">
+      <object class="GtkMenuItem" id="MenuFormat-ChangeCaseToTitleCase">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ChangeCaseToTitleCase</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ChangeCaseToToggleCaseD">
+      <object class="GtkMenuItem" id="MenuFormat-ChangeCaseToToggleCase">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ChangeCaseToToggleCase</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator40">
+      <object class="GtkSeparatorMenuItem" id="MenuFormat-separator5">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertNonBreakingSpaceD">
+      <object class="GtkMenuItem" id="MenuFormat-InsertNonBreakingSpace">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertNonBreakingSpace</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertHardHyphenD">
+      <object class="GtkMenuItem" id="MenuFormat-InsertHardHyphen">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertHardHyphen</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertSoftHyphenD">
+      <object class="GtkMenuItem" id="MenuFormat-InsertSoftHyphen">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertSoftHyphen</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertZWSPD">
+      <object class="GtkMenuItem" id="MenuFormat-InsertZWSP">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertZWSP</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertZWNBSPD">
+      <object class="GtkMenuItem" id="MenuFormat-InsertZWNBSP">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertZWNBSP</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertLRMD">
+      <object class="GtkMenuItem" id="MenuFormat-InsertLRM">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertLRM</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertRLMD">
+      <object class="GtkMenuItem" id="MenuFormat-InsertRLM">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertRLM</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator22">
+      <object class="GtkSeparatorMenuItem" id="MenuFormat-separator6">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="FontDialog3">
+      <object class="GtkMenuItem" id="MenuFormat-FontDialog">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:FontDialog</property>
@@ -1256,88 +1195,88 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="CropD">
+      <object class="GtkMenuItem" id="MenuGraphic-Crop">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:Crop</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ExternalEditD">
+      <object class="GtkMenuItem" id="MenuGraphic-ExternalEdit">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ExternalEdit</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ChangePictureD">
+      <object class="GtkMenuItem" id="MenuGraphic-ChangePicture">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ChangePicture</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="CompressGraphicD">
+      <object class="GtkMenuItem" id="MenuGraphic-CompressGraphic">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:CompressGraphic</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SaveGraphicD">
+      <object class="GtkMenuItem" id="MenuGraphic-SaveGraphic">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:SaveGraphic</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator16">
+      <object class="GtkSeparatorMenuItem" id="MenuGraphic-separator1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="FlipVerticalD">
+      <object class="GtkMenuItem" id="MenuGraphic-FlipVertical">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:FlipVertical</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="FlipHorizontalD">
+      <object class="GtkMenuItem" id="MenuGraphic-FlipHorizontal">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:FlipHorizontal</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator17">
+      <object class="GtkSeparatorMenuItem" id="MenuGraphic-separator2">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ImageMapDialogD">
+      <object class="GtkMenuItem" id="MenuGraphic-ImageMapDialog">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ImageMapDialog</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator18">
+      <object class="GtkSeparatorMenuItem" id="MenuGraphic-separator3">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertCaptionDialogD">
+      <object class="GtkMenuItem" id="MenuGraphic-InsertCaptionDialog">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertCaptionDialog</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="GraphicDialogD">
+      <object class="GtkMenuItem" id="MenuGraphic-GraphicDialog">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:GraphicDialog</property>
@@ -1348,89 +1287,149 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="RulerDe">
+      <object class="GtkMenuItem" id="MenuGrid-Ruler">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:Ruler</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="VRulerDe">
+      <object class="GtkMenuItem" id="MenuGrid-VRuler">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:VRuler</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator2">
+      <object class="GtkSeparatorMenuItem" id="MenuGrid-separator1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuGrid-ViewBounds">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:ViewBounds</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuGrid-TableBoundaries">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:TableBoundaries</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ShowGraphics">
+      <object class="GtkMenuItem" id="MenuGrid-ShowGraphics">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ShowGraphics</property>
       </object>
     </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="MenuGrid-separator2">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuGrid-GridVisible">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:GridVisible</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuGrid-GridUse">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:GridUse</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuGrid-HelplinesMove">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:HelplinesMove</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="MenuGrid-separator3">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuGrid-HideWhitespace">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:HideWhitespace</property>
+      </object>
+    </child>
   </object>
   <object class="GtkMenu" id="MenuGroup">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="GroupBoxD">
+      <object class="GtkMenuItem" id="MenuGroup-GroupBox">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:GroupBox</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="NameGroupD">
+      <object class="GtkSeparatorMenuItem" id="MenuGroup-separator1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:NameGroup</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ObjectTitleDescriptionD">
+      <object class="GtkMenuItem" id="MenuGroup-FormatGroup">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:ObjectTitleDescription</property>
+        <property name="action_name">.uno:FormatGroup</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator119">
+      <object class="GtkMenuItem" id="MenuGroup-FormatUngroup">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:FormatUngroup</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="FormatGroupD">
+      <object class="GtkMenuItem" id="MenuGroup-EnterGroup">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:FormatGroup</property>
+        <property name="action_name">.uno:EnterGroup</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="FormatUngroupD">
+      <object class="GtkMenuItem" id="MenuGroup-LeaveGroup">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:FormatUngroup</property>
+        <property name="action_name">.uno:LeaveGroup</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="EnterGroupD">
+      <object class="GtkSeparatorMenuItem" id="MenuGroup-separator2">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:EnterGroup</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="LeaveGroupD">
+      <object class="GtkMenuItem" id="MenuGroup-NameGroup">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:LeaveGroup</property>
+        <property name="action_name">.uno:NameGroup</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuGroup-ObjectTitleDescription">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:ObjectTitleDescription</property>
       </object>
     </child>
   </object>
@@ -1438,68 +1437,68 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="HelpIndexD">
+      <object class="GtkMenuItem" id="MenuHelp-HelpIndex">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:HelpIndex</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ExtendedHelpD">
+      <object class="GtkMenuItem" id="MenuHelp-ExtendedHelp">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ExtendedHelp</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="DocumentationD">
+      <object class="GtkMenuItem" id="MenuHelp-Documentation">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:Documentation</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator43">
+      <object class="GtkSeparatorMenuItem" id="MenuHelp-separator1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="QuestionAnswersD1">
+      <object class="GtkMenuItem" id="MenuHelp-QuestionAnswers">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:QuestionAnswers</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SendFeedbackD1">
+      <object class="GtkMenuItem" id="MenuHelp-SendFeedback">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:SendFeedback</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="DonationD1">
+      <object class="GtkMenuItem" id="MenuHelp-Donation">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:Donation</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator58">
+      <object class="GtkSeparatorMenuItem" id="MenuHelp-separator2">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SafeModeD1">
+      <object class="GtkMenuItem" id="MenuHelp-SafeMode">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:SafeMode</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="UpdateMenuD">
+      <object class="GtkMenuItem" id="MenuHelp-UpdateMenu">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">vnd.sun.star.job:alias=UpdateCheck</property>
@@ -1507,20 +1506,20 @@
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator64">
+      <object class="GtkSeparatorMenuItem" id="MenuHelp-separator3">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ShowLicenseD1">
+      <object class="GtkMenuItem" id="MenuHelp-ShowLicense">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ShowLicense</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="AboutD">
+      <object class="GtkMenuItem" id="MenuHelp-About">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:About</property>
@@ -1531,142 +1530,149 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="TitlePageDialogD1">
+      <object class="GtkMenuItem" id="MenuInsert-TitlePageDialog">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:TitlePageDialog</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertBreakD">
+      <object class="GtkMenuItem" id="MenuInsert-InsertBreak">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertBreak</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertSectionD">
+      <object class="GtkMenuItem" id="MenuInsert-InsertSection">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertSection</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator80">
+      <object class="GtkSeparatorMenuItem" id="MenuInsert-separator1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="GalleryD">
+      <object class="GtkMenuItem" id="MenuInsert-Gallery">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:Gallery</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="TwainSelectD">
+      <object class="GtkMenuItem" id="MenuInsert-InsertAVMedia">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:TwainSelect</property>
+        <property name="action_name">.uno:InsertAVMedia</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertAVMediaD">
+      <object class="GtkMenuItem" id="MenuInsert-TwainSelect">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertAVMedia</property>
+        <property name="action_name">.uno:TwainSelect</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator8">
+      <object class="GtkSeparatorMenuItem" id="MenuInsert-separator2">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertObjectD">
+      <object class="GtkMenuItem" id="MenuInsert-InsertObject">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertObject</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertDocD">
+      <object class="GtkMenuItem" id="MenuInsert-InsertDoc">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertDoc</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertFormulaD1">
+      <object class="GtkMenuItem" id="MenuInsert-InsertFormula">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertFormula</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator81">
+      <object class="GtkSeparatorMenuItem" id="MenuInsert-separator3">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="DrawTextD">
+      <object class="GtkMenuItem" id="MenuInsert-DrawText">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:DrawText</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="FontworkGalleryFloaterD">
+      <object class="GtkMenuItem" id="MenuInsert-VerticalText">
+        <property name="visible">True</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>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="EditGlossaryD">
+      <object class="GtkMenuItem" id="MenuInsert-EditGlossary">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:EditGlossary</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator82">
+      <object class="GtkSeparatorMenuItem" id="MenuInsert-separator4">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertFrameInteractD">
+      <object class="GtkMenuItem" id="MenuInsert-InsertFrameInteract">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertFrameInteract</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertObjectFloatingFrameD">
+      <object class="GtkMenuItem" id="MenuInsert-InsertObjectFloatingFrame">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertObjectFloatingFrame</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator83">
+      <object class="GtkSeparatorMenuItem" id="MenuInsert-separator5">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertSignatureLineD">
+      <object class="GtkMenuItem" id="MenuInsert-InsertSignatureLine">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertSignatureLine</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertEnvelopeD">
+      <object class="GtkMenuItem" id="MenuInsert-InsertEnvelope">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertEnvelope</property>
@@ -1677,98 +1683,129 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="SpellingAndGrammarDialogD1">
+      <object class="GtkMenuItem" id="MenuLanguage-SpellingAndGrammarDialog">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:SpellingAndGrammarDialog</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SpellOnlineD1">
+      <object class="GtkMenuItem" id="MenuLanguage-SpellOnline">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:SpellOnline</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ThesaurusDialogD1">
+      <object class="GtkMenuItem" id="MenuLanguage-ThesaurusDialog">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ThesaurusDialog</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator112">
+      <object class="GtkMenuItem" id="MenuLanguage-MoreDictionaries">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:MoreDictionaries</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SetLanguageSelectionMenuD1">
+      <object class="GtkSeparatorMenuItem" id="MenuLanguage-separator1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuLanguage-SetLanguageSelectionMenu">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:SetLanguageSelectionMenu</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SetLanguageParagraphMenuD1">
+      <object class="GtkMenuItem" id="MenuLanguage-SetLanguageParagraphMenu">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:SetLanguageParagraphMenu</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SetLanguageAllTextMenuD1">
+      <object class="GtkMenuItem" id="MenuLanguage-SetLanguageAllTextMenu">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:SetLanguageAllTextMenu</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator113">
+      <object class="GtkSeparatorMenuItem" id="MenuLanguage-separator2">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuLanguage-ChineseConversion">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:ChineseConversion</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuLanguage-HangulHanjaConversion">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:HangulHanjaConversion</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="MenuLanguage-separator3">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="HyphenateD1">
+      <object class="GtkMenuItem" id="MenuLanguage-Hyphenate">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:Hyphenate</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ChineseConversionD1">
+      <object class="GtkMenuItem" id="MenuLanguage-WordCountDialog">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:ChineseConversion</property>
+        <property name="action_name">.uno:WordCountDialog</property>
       </object>
     </child>
+  </object>
+  <object class="GtkMenu" id="MenuMedia">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="HangulHanjaConversionD1">
+      <object class="GtkMenuItem" id="MenuMedia-AVMediaPlayer">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:HangulHanjaConversion</property>
+        <property name="action_name">.uno:AVMediaPlayer</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MoreDictionariesD1">
+      <object class="GtkSeparatorMenuItem" id="MenuMedia-separator1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:MoreDictionaries</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator114">
+      <object class="GtkMenuItem" id="MenuMedia-NameGroup">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:NameGroup</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="WordCountDialogD1">
+      <object class="GtkMenuItem" id="MenuMedia-ObjectTitleDescription">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:WordCountDialog</property>
+        <property name="action_name">.uno:ObjectTitleDescription</property>
       </object>
     </child>
   </object>
@@ -1776,61 +1813,61 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="MergeCellsD">
+      <object class="GtkMenuItem" id="MenuMerge-MergeCells">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:MergeCells</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SplitCellD">
+      <object class="GtkMenuItem" id="MenuMerge-SplitCell">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:SplitCell</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MergeTableD">
+      <object class="GtkMenuItem" id="MenuMerge-MergeTable">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:MergeTable</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator41">
+      <object class="GtkSeparatorMenuItem" id="MenuMerge-separator1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SplitTableD">
+      <object class="GtkMenuItem" id="MenuMerge-SplitTable">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:SplitTable</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="DeleteTableD">
+      <object class="GtkMenuItem" id="MenuMerge-DeleteTable">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:DeleteTable</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator46">
+      <object class="GtkSeparatorMenuItem" id="MenuMerge-separator2">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ProtectD">
+      <object class="GtkMenuItem" id="MenuMerge-Protect">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:Protect</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="UnsetCellsReadOnlyD">
+      <object class="GtkMenuItem" id="MenuMerge-UnsetCellsReadOnly">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:UnsetCellsReadOnly</property>
@@ -1841,20 +1878,20 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="ObjectMenue">
+      <object class="GtkMenuItem" id="MenuOLE-ObjectMenue">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ObjectMenue</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator154">
+      <object class="GtkSeparatorMenuItem" id="MenuOLE-separator1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertCaptionDialog3">
+      <object class="GtkMenuItem" id="MenuOLE-InsertCaptionDialog">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertCaptionDialog</property>
@@ -1865,222 +1902,222 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="ParaLeftToRightD">
+      <object class="GtkMenuItem" id="MenuParagraph-ParaLeftToRight">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ParaLeftToRight</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ParaRightToLeftD">
+      <object class="GtkMenuItem" id="MenuParagraph-ParaRightToLeft">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ParaRightToLeft</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator79">
+      <object class="GtkSeparatorMenuItem" id="MenuParagraph-separator1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ParaspaceIncreaseD">
+      <object class="GtkMenuItem" id="MenuParagraph-ParaspaceIncrease">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ParaspaceIncrease</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ParaspaceDecreaseD">
+      <object class="GtkMenuItem" id="MenuParagraph-ParaspaceDecrease">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ParaspaceDecrease</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator57">
+      <object class="GtkSeparatorMenuItem" id="MenuParagraph-separator2">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="IncrementIndentD">
+      <object class="GtkMenuItem" id="MenuParagraph-IncrementIndent">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:IncrementIndent</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="DecrementIndentD">
+      <object class="GtkMenuItem" id="MenuParagraph-DecrementIndent">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:DecrementIndent</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator137">
+      <object class="GtkSeparatorMenuItem" id="MenuParagraph-separator3">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="CommonAlignTopD">
+      <object class="GtkMenuItem" id="MenuParagraph-CommonAlignTop">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:CommonAlignTop</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="CommonAlignVerticalCenterD">
+      <object class="GtkMenuItem" id="MenuParagraph-CommonAlignVerticalCenter">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:CommonAlignVerticalCenter</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="CommonAlignBottomD">
+      <object class="GtkMenuItem" id="MenuParagraph-CommonAlignBottom">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:CommonAlignBottom</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator63">
+      <object class="GtkSeparatorMenuItem" id="MenuParagraph-separator4">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="BulletsAndNumberingDialogD">
+      <object class="GtkMenuItem" id="MenuParagraph-BulletsAndNumberingDialog">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:BulletsAndNumberingDialog</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator62">
+      <object class="GtkSeparatorMenuItem" id="MenuParagraph-separator5">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="DecrementLevelD">
+      <object class="GtkMenuItem" id="MenuParagraph-DecrementLevel">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:DecrementLevel</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="IncrementLevelD">
+      <object class="GtkMenuItem" id="MenuParagraph-IncrementLevel">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:IncrementLevel</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="DecrementSubLevelsD">
+      <object class="GtkMenuItem" id="MenuParagraph-DecrementSubLevels">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:DecrementSubLevels</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="IncrementSubLevelsD">
+      <object class="GtkMenuItem" id="MenuParagraph-IncrementSubLevels">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:IncrementSubLevels</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator75">
+      <object class="GtkSeparatorMenuItem" id="MenuParagraph-separator6">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MoveUpD">
+      <object class="GtkMenuItem" id="MenuParagraph-MoveUp">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:MoveUp</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MoveDownD">
+      <object class="GtkMenuItem" id="MenuParagraph-MoveDown">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:MoveDown</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MoveUpSubItemsD">
+      <object class="GtkMenuItem" id="MenuParagraph-MoveUpSubItems">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:MoveUpSubItems</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MoveDownSubItemsD">
+      <object class="GtkMenuItem" id="MenuParagraph-MoveDownSubItems">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:MoveDownSubItems</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator76">
+      <object class="GtkSeparatorMenuItem" id="MenuParagraph-separator7">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertNeutralParagraphD">
+      <object class="GtkMenuItem" id="MenuParagraph-InsertNeutralParagraph">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertNeutralParagraph</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="NumberingStartD">
+      <object class="GtkMenuItem" id="MenuParagraph-NumberingStart">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:NumberingStart</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator77">
+      <object class="GtkSeparatorMenuItem" id="MenuParagraph-separator8">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="JumpDownThisLevelD">
+      <object class="GtkMenuItem" id="MenuParagraph-JumpDownThisLevel">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:JumpDownThisLevel</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="JumpUpThisLevelD">
+      <object class="GtkMenuItem" id="MenuParagraph-JumpUpThisLevel">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:JumpUpThisLevel</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ContinueNumberingD">
+      <object class="GtkMenuItem" id="MenuParagraph-ContinueNumbering">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ContinueNumbering</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator78">
+      <object class="GtkSeparatorMenuItem" id="MenuParagraph-separator9">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ParagraphDialogD">
+      <object class="GtkMenuItem" id="MenuParagraph-ParagraphDialog">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ParagraphDialog</property>
@@ -2091,146 +2128,159 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="GoToStartOfDocD">
+      <object class="GtkMenuItem" id="MenuPrint-GoToStartOfDoc">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:GoToStartOfDoc</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="PageUpD">
+      <object class="GtkMenuItem" id="MenuPrint-PageUp">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:PageUp</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="PageDownD">
+      <object class="GtkMenuItem" id="MenuPrint-PageDown">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:PageDown</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="GoToEndOfDocD">
+      <object class="GtkMenuItem" id="MenuPrint-GoToEndOfDoc">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:GoToEndOfDoc</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator105">
+      <object class="GtkSeparatorMenuItem" id="MenuPrint-separator1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="PrintD">
+      <object class="GtkMenuItem" id="MenuPrint-Print">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:Print</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ClosePreviewD">
+      <object class="GtkMenuItem" id="MenuPrint-ClosePreview">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ClosePreview</property>
       </object>
     </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="MenuPrint-separator2">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuPrint-PageDialog">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:PageDialog</property>
+      </object>
+    </child>
   </object>
   <object class="GtkMenu" id="MenuReference">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="InsertIndexesEntryD">
+      <object class="GtkMenuItem" id="MenuReference-InsertIndexesEntry">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertIndexesEntry</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertMultiIndexD">
+      <object class="GtkMenuItem" id="MenuReference-InsertMultiIndex">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertMultiIndex</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator85">
+      <object class="GtkSeparatorMenuItem" id="MenuReference-separator1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertEndnoteD">
+      <object class="GtkMenuItem" id="MenuReference-InsertEndnote">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertEndnote</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertFootnoteDialogD">
+      <object class="GtkMenuItem" id="MenuReference-InsertFootnoteDialog">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertFootnoteDialog</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator87">
+      <object class="GtkSeparatorMenuItem" id="MenuReference-separator2">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertPageNumberFieldD">
+      <object class="GtkMenuItem" id="MenuReference-InsertPageNumberField">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertPageNumberField</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertFieldCtrlD">
+      <object class="GtkMenuItem" id="MenuReference-InsertFieldCtrl">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertFieldCtrl</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator84">
+      <object class="GtkSeparatorMenuItem" id="MenuReference-separator3">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertAuthoritiesEntryD">
+      <object class="GtkMenuItem" id="MenuReference-InsertAuthoritiesEntry">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertAuthoritiesEntry</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="BibliographyComponentD">
+      <object class="GtkMenuItem" id="MenuReference-BibliographyComponent">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:BibliographyComponent</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator86">
+      <object class="GtkSeparatorMenuItem" id="MenuReference-separator4">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="UpdateAllD">
+      <object class="GtkMenuItem" id="MenuReference-UpdateAll">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:UpdateAll</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="UpdateFieldsD">
+      <object class="GtkMenuItem" id="MenuReference-UpdateFields">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:UpdateFields</property>
@@ -2241,163 +2291,166 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="SpellingAndGrammarDialogD">
+      <object class="GtkMenuItem" id="MenuReview-SpellingAndGrammarDialog">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:SpellingAndGrammarDialog</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SpellOnlineD">
+      <object class="GtkMenuItem" id="MenuReview-SpellOnline">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:SpellOnline</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ThesaurusDialogD">
+      <object class="GtkMenuItem" id="MenuReview-ThesaurusDialog">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ThesaurusDialog</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="WordCountDialogD">
+      <object class="GtkMenuItem" id="MenuReview-MoreDictionaries">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:WordCountDialog</property>
+        <property name="action_name">.uno:MoreDictionaries</property>
       </object>
+      <packing>
+        <property name="bottom_attach">0</property>
+      </packing>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator89">
+      <object class="GtkSeparatorMenuItem" id="MenuReview-separator1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SetLanguageSelectionMenuD">
+      <object class="GtkMenuItem" id="MenuReview-SetLanguageSelectionMenu">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:SetLanguageSelectionMenu</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SetLanguageParagraphMenuD">
+      <object class="GtkMenuItem" id="MenuReview-SetLanguageParagraphMenu">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:SetLanguageParagraphMenu</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SetLanguageAllTextMenuD">
+      <object class="GtkMenuItem" id="MenuReview-SetLanguageAllTextMenu">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:SetLanguageAllTextMenu</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator90">
+      <object class="GtkSeparatorMenuItem" id="MenuReview-separator2">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="HyphenateD">
+      <object class="GtkMenuItem" id="MenuReview-ChineseConversion">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:Hyphenate</property>
+        <property name="action_name">.uno:ChineseConversion</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ChineseConversionD">
+      <object class="GtkMenuItem" id="MenuReview-HangulHanjaConversion">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:ChineseConversion</property>
+        <property name="action_name">.uno:HangulHanjaConversion</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="HangulHanjaConversionD">
+      <object class="GtkMenuItem" id="MenuReview-Hyphenate">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:HangulHanjaConversion</property>
+        <property name="action_name">.uno:Hyphenate</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MoreDictionariesD">
+      <object class="GtkMenuItem" id="MenuReview-WordCountDialog">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:MoreDictionaries</property>
+        <property name="action_name">.uno:WordCountDialog</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator91">
+      <object class="GtkSeparatorMenuItem" id="MenuReview-separator3">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="TrackChangesD">
+      <object class="GtkMenuItem" id="MenuReview-TrackChanges">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:TrackChanges</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ShowTrackedChangesD">
+      <object class="GtkMenuItem" id="MenuReview-ShowTrackedChanges">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ShowTrackedChanges</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="AcceptTrackedChangesD">
+      <object class="GtkMenuItem" id="MenuReview-AcceptTrackedChanges">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:AcceptTrackedChanges</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator92">
+      <object class="GtkSeparatorMenuItem" id="MenuReview-separator4">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertAnnotationD">
+      <object class="GtkMenuItem" id="MenuReview-InsertAnnotation">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertAnnotation</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ShowAnnotationsD">
+      <object class="GtkMenuItem" id="MenuReview-ShowAnnotations">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ShowAnnotations</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator93">
+      <object class="GtkSeparatorMenuItem" id="MenuReview-separator5">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ProtectTraceChangeModeD">
+      <object class="GtkMenuItem" id="MenuReview-ProtectTraceChangeMode">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ProtectTraceChangeMode</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="CompareDocuments">
+      <object class="GtkMenuItem" id="MenuReview-CompareDocuments">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:CompareDocuments</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MergeDocumentsD">
+      <object class="GtkMenuItem" id="MenuReview-MergeDocuments">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:MergeDocuments</property>
@@ -2408,68 +2461,68 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="InsertRowsBeforeD">
+      <object class="GtkMenuItem" id="MenuRowsColumns-InsertRowsBefore">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertRowsBefore</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertRowsAfterD">
+      <object class="GtkMenuItem" id="MenuRowsColumns-InsertRowsAfter">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertRowsAfter</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertRowDialogD">
+      <object class="GtkMenuItem" id="MenuRowsColumns-InsertRowDialog">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertRowDialog</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator35">
+      <object class="GtkSeparatorMenuItem" id="MenuRowsColumns-separator1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertColumnsBeforeD">
+      <object class="GtkMenuItem" id="MenuRowsColumns-InsertColumnsBefore">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertColumnsBefore</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertColumnsAfterD">
+      <object class="GtkMenuItem" id="MenuRowsColumns-InsertColumnsAfter">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertColumnsAfter</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertColumnDialogD">
+      <object class="GtkMenuItem" id="MenuRowsColumns-InsertColumnDialog">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertColumnDialog</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator45">
+      <object class="GtkSeparatorMenuItem" id="MenuRowsColumns-separator2">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="DeleteRowsD">
+      <object class="GtkMenuItem" id="MenuRowsColumns-DeleteRows">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:DeleteRows</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="DeleteColumnsD">
+      <object class="GtkMenuItem" id="MenuRowsColumns-DeleteColumns">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:DeleteColumns</property>
@@ -2480,96 +2533,96 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="EntireCellD">
+      <object class="GtkMenuItem" id="MenuSelect-EntireCell">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:EntireCell</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="EntireRowD">
+      <object class="GtkMenuItem" id="MenuSelect-EntireRow">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:EntireRow</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="EntireColumnD">
+      <object class="GtkMenuItem" id="MenuSelect-EntireColumn">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:EntireColumn</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SelectTableD">
+      <object class="GtkMenuItem" id="MenuSelect-SelectTable">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:SelectTable</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator49">
+      <object class="GtkSeparatorMenuItem" id="MenuSelect-separator1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SetRowHeightD">
+      <object class="GtkMenuItem" id="MenuSelect-SetRowHeight">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:SetRowHeight</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SetMinimalRowHeightD">
+      <object class="GtkMenuItem" id="MenuSelect-SetMinimalRowHeight">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:SetMinimalRowHeight</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SetOptimalRowHeightD">
+      <object class="GtkMenuItem" id="MenuSelect-SetOptimalRowHeight">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:SetOptimalRowHeight</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="DistributeRowsD">
+      <object class="GtkMenuItem" id="MenuSelect-DistributeRows">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:DistributeRows</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator51">
+      <object class="GtkSeparatorMenuItem" id="MenuSelect-separator2">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SetColumnWidthD">
+      <object class="GtkMenuItem" id="MenuSelect-SetColumnWidth">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:SetColumnWidth</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SetMinimalColumnWidthD">
+      <object class="GtkMenuItem" id="MenuSelect-SetMinimalColumnWidth">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:SetMinimalColumnWidth</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SetOptimalColumnWidthD">
+      <object class="GtkMenuItem" id="MenuSelect-SetOptimalColumnWidth">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:SetOptimalColumnWidth</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="DistributeColumnsD">
+      <object class="GtkMenuItem" id="MenuSelect-DistributeColumns">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:DistributeColumns</property>
@@ -2580,61 +2633,62 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="MenubarD1">
+      <object class="GtkMenuItem" id="MenuSettings-Menubar">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:Menubar</property>
+        <property name="label" translatable="yes" context="notebookbar_groupedbar_full|MenubarAction">Menubar</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SidebarD">
+      <object class="GtkMenuItem" id="MenuSettings-Sidebar">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:Sidebar</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator99">
+      <object class="GtkSeparatorMenuItem" id="MenuSettings-separator1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ToolbarModeD">
+      <object class="GtkMenuItem" id="MenuSettings-ToolbarMode">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ToolbarMode</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="AvailableToolbarsD">
+      <object class="GtkMenuItem" id="MenuSettings-AvailableToolbars">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:AvailableToolbars</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="OptionsTreeDialogD">
+      <object class="GtkMenuItem" id="MenuSettings-OptionsTreeDialog">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:OptionsTreeDialog</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator97">
+      <object class="GtkSeparatorMenuItem" id="MenuSettings-separator2">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ExtensionsD">
+      <object class="GtkMenuItem" id="MenuSettings-Extensions">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">service:com.sun.star.deployment.ui.PackageManagerDialog</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="UpdateMenuD1">
+      <object class="GtkMenuItem" id="MenuSettings-UpdateMenu">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">vnd.sun.star.job:alias=UpdateCheck</property>
@@ -2642,134 +2696,145 @@
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator98">
+      <object class="GtkSeparatorMenuItem" id="MenuSettings-separator3">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="HelpIndexD1">
+      <object class="GtkMenuItem" id="MenuSettings-HelpIndex">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:HelpIndex</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="AboutD1">
+      <object class="GtkMenuItem" id="MenuSettings-About">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:About</property>
       </object>
     </child>
   </object>
-  <object class="GtkMenu" id="MenuStyle">
+  <object class="GtkMenu" id="MenuSlideLayout">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="paradefault">
+      <object class="GtkMenuItem" id="MenuSlideLayout-ShowSinglePage">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:StyleApply?Style:string=Standard&amp;FamilyName:string=ParagraphStyles</property>
+        <property name="action_name">.uno:ShowSinglePage</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="textBody">
+      <object class="GtkMenuItem" id="MenuSlideLayout-ShowTwoPages">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:StyleApply?Style:string=Text body&amp;FamilyName:string=ParagraphStyles</property>
+        <property name="action_name">.uno:ShowTwoPages</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="Quotations">
+      <object class="GtkMenuItem" id="MenuSlideLayout-ShowBookview">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:StyleApply?Style:string=Quotations&amp;FamilyName:string=ParagraphStyles</property>
+        <property name="action_name">.uno:ShowBookview</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="preformattedText">
+      <object class="GtkMenuItem" id="MenuSlideLayout-ShowMultiplePages">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:StyleApply?Style:string=Preformatted Text&amp;FamilyName:string=ParagraphStyles</property>
+        <property name="action_name">.uno:ShowMultiplePages</property>
       </object>
     </child>
+  </object>
+  <object class="GtkMenu" id="MenuStyle">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator36">
+      <object class="GtkMenuItem" id="MenuStyles-TextBody">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:StyleApply?Style:string=Text body&amp;FamilyName:string=ParagraphStyles</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="MenuStyles-separator1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="title">
+      <object class="GtkMenuItem" id="MenuStyles-Title">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:StyleApply?Style:string=Title&amp;FamilyName:string=ParagraphStyles</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="subtitle">
+      <object class="GtkMenuItem" id="MenuStyles-Subtitle">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:StyleApply?Style:string=Subtitle&amp;FamilyName:string=ParagraphStyles</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="heading1">
+      <object class="GtkMenuItem" id="MenuStyles-Heading1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:StyleApply?Style:string=Heading 1&amp;FamilyName:string=ParagraphStyles</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="heading2">
+      <object class="GtkMenuItem" id="MenuStyles-Heading2">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:StyleApply?Style:string=Heading 2&amp;FamilyName:string=ParagraphStyles</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="heading3">
+      <object class="GtkMenuItem" id="MenuStyles-Heading3">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:StyleApply?Style:string=Heading 3&amp;FamilyName:string=ParagraphStyles</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="heading4">
+      <object class="GtkMenuItem" id="MenuStyles-Heading4">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:StyleApply?Style:string=Heading 4&amp;FamilyName:string=ParagraphStyles</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator103">
+      <object class="GtkSeparatorMenuItem" id="MenuStyles-separator2">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="defaultstyle">
+      <object class="GtkMenuItem" id="MenuStyles-DefaultStyle">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:StyleApply?Style:string=Standard&amp;FamilyName:string=CharacterStyles</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="Emphasis">
+      <object class="GtkMenuItem" id="MenuStyles-Emphasis">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:StyleApply?Style:string=Emphasis&amp;FamilyName:string=CharacterStyles</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="EmphasisStrong">
+      <object class="GtkMenuItem" id="MenuStyles-EmphasisStrong">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:StyleApply?Style:string=Strong Emphasis&amp;FamilyName:string=CharacterStyles</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="Quotation2">
+      <object class="GtkMenuItem" id="MenuStyles-Quotation">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:StyleApply?Style:string=Quotation&amp;FamilyName:string=CharacterStyles</property>
@@ -2777,88 +2842,88 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SourceCode">
+      <object class="GtkMenuItem" id="MenuStyles-SourceCode">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:StyleApply?Style:string=Source Text&amp;FamilyName:string=CharacterStyles</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator37">
+      <object class="GtkSeparatorMenuItem" id="MenuStyles-separator3">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="listStyle">
+      <object class="GtkMenuItem" id="MenuStyles-ListStyle">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:StyleApply?Style:string=List 1&amp;FamilyName:string=NumberingStyles</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="numbering123">
+      <object class="GtkMenuItem" id="MenuStyles-Numbering_123">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:StyleApply?Style:string=Numbering 123&amp;FamilyName:string=NumberingStyles</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="numberingabc">
+      <object class="GtkMenuItem" id="MenuStyles-Numbering_abc">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:StyleApply?Style:string=Numbering abc&amp;FamilyName:string=NumberingStyles</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="numberingIVX">
+      <object class="GtkMenuItem" id="MenuStyles-Numbering_IVX">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:StyleApply?Style:string=Numbering IVX&amp;FamilyName:string=NumberingStyles</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator157">
+      <object class="GtkSeparatorMenuItem" id="MenuStyles-separator4">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="editstyle">
+      <object class="GtkMenuItem" id="MenuStyles-EditStyle">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:EditStyle</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="styleupdatesbyexample">
+      <object class="GtkMenuItem" id="MenuStyles-StyleUpdateByExample">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:StyleUpdateByExample</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="stylenewbyexample">
+      <object class="GtkMenuItem" id="MenuStyles-StyleNewByExample">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:StyleNewByExample</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="styleload">
+      <object class="GtkMenuItem" id="MenuStyles-LoadStyles">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:LoadStyles</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator152">
+      <object class="GtkSeparatorMenuItem" id="MenuStyles-separator5">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="designDialog">
+      <object class="GtkMenuItem" id="MenuStyles-DesignDialog">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:DesignerDialog</property>
@@ -2869,212 +2934,230 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="AutoFormatD1">
+      <object class="GtkMenuItem" id="MenuTable-SplitTable">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertCaptionDialog</property>
+        <property name="action_name">.uno:SplitTable</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator47">
+      <object class="GtkMenuItem" id="MenuTable-SplitCell">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:SplitCell</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuTable-MergeCells">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:MergeCells</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="AutoFormatD">
+      <object class="GtkSeparatorMenuItem" id="MenuTable-separator1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <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>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="HeadingRowsRepeatD">
+      <object class="GtkSeparatorMenuItem" id="MenuTable-separator2">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:HeadingRowsRepeat</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="RowSplitD">
+      <object class="GtkMenuItem" id="MenuTable-RowSplit">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:RowSplit</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator33">
+      <object class="GtkMenuItem" id="MenuTable-HeadingRowsRepeat">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:HeadingRowsRepeat</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ConvertTextToTableD">
+      <object class="GtkMenuItem" id="MenuTable-TableNumberRecognition">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:ConvertTextToTable</property>
+        <property name="action_name">.uno:TableNumberRecognition</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ConvertTableToTextD">
+      <object class="GtkMenuItem" id="MenuTable-TableBoundaries">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:ConvertTableToText</property>
+        <property name="action_name">.uno:TableBoundaries</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator34">
+      <object class="GtkSeparatorMenuItem" id="MenuTable-separator3">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="TableNumberRecognitionD">
+      <object class="GtkMenuItem" id="MenuTable-ConvertTextToTable">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:TableNumberRecognition</property>
+        <property name="action_name">.uno:ConvertTextToTable</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="TableBoundaries">
+      <object class="GtkMenuItem" id="MenuTable-ConvertTableToText">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:TableBoundaries</property>
+        <property name="action_name">.uno:ConvertTableToText</property>
       </object>
     </child>
-  </object>
-  <object class="GtkMenu" id="MenuTools">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="MacroOrganizerD">
+      <object class="GtkSeparatorMenuItem" id="MenuTable-separator4">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:MacroOrganizer?TabId:short=1</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MacroSignatureD">
+      <object class="GtkMenuItem" id="MenuTable-InsertCaptionDialog">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:MacroSignature</property>
+        <property name="action_name">.uno:InsertCaptionDialog</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ScriptOrganizerD">
+      <object class="GtkMenuItem" id="MenuTable-TableDialog">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:ScriptOrganizer</property>
+        <property name="action_name">.uno:TableDialog</property>
       </object>
     </child>
+  </object>
+  <object class="GtkMenu" id="MenuTools">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="ViewDataSourceBrowserD">
+      <object class="GtkMenuItem" id="MenuTools-MacroRecorder">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:ViewDataSourceBrowser</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>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="BasicIDEAppearD">
+      <object class="GtkMenuItem" id="MenuTools-BasicIDEAppear">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:BasicIDEAppear</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="RunMacroD">
+      <object class="GtkMenuItem" id="MenuTools-MacroOrganizer">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:RunMacro</property>
+        <property name="action_name">.uno:MacroOrganizer?TabId:short=1</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MacroRecorderD">
+      <object class="GtkMenuItem" id="MenuTools-ScriptOrganizer">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:MacroRecorder</property>
+        <property name="action_name">.uno:ScriptOrganizer</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator60">
+      <object class="GtkMenuItem" id="MenuTools-MacroSignature">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:MacroSignature</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MailMergeWizardD">
+      <object class="GtkSeparatorMenuItem" id="MenuTools-separator1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:MailMergeWizard</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertEnvelopeD2">
+      <object class="GtkMenuItem" id="MenuTools-MailMergeWizard">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertEnvelope</property>
+        <property name="action_name">.uno:MailMergeWizard</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator88">
+      <object class="GtkMenuItem" id="MenuTools-InsertEnvelope">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:InsertEnvelope</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="AddressBookSource">
+      <object class="GtkSeparatorMenuItem" id="MenuTools-separator2">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:AddressBookSource</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="BibliographyComponent1">
+      <object class="GtkMenuItem" id="MenuTools-AddressBookSource">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:BibliographyComponent</property>
+        <property name="action_name">.uno:AddressBookSource</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ChangeDatabaseFieldD">
+      <object class="GtkMenuItem" id="MenuTools-BibliographyComponent">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:ChangeDatabaseField</property>
+        <property name="action_name">.uno:BibliographyComponent</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator94">
+      <object class="GtkSeparatorMenuItem" id="MenuTools-separator3">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="OpenXMLFilterSettingsD">
+      <object class="GtkMenuItem" id="MenuTools-ChangeDatabaseField">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:OpenXMLFilterSettings</property>
+        <property name="action_name">.uno:ChangeDatabaseField</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="PackageManagerDialogD">
+      <object class="GtkMenuItem" id="MenuTools-ViewDataSourceBrowser">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">service:com.sun.star.deployment.ui.PackageManagerDialog</property>
+        <property name="action_name">.uno:ViewDataSourceBrowser</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="UpdateMenuD2">
+      <object class="GtkSeparatorMenuItem" id="MenuTools-separator4">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">vnd.sun.star.job:alias=UpdateCheck</property>
-        <property name="label" translatable="yes" context="notebookbar_groupedbar_full|ToolsButton">_Check for Updates...</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="OptionsTreeDialogD1">
+      <object class="GtkMenuItem" id="MenuTools-OpenXMLFilterSettings">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:OptionsTreeDialog</property>
+        <property name="action_name">.uno:OpenXMLFilterSettings</property>
       </object>
     </child>
   </object>
@@ -3082,235 +3165,156 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="PrintLayoutD">
+      <object class="GtkMenuItem" id="MenuView-PrintLayout">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:PrintLayout</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="BrowseViewF">
+      <object class="GtkMenuItem" id="MenuView-BrowseView">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:BrowseView</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="HideWhitespaceD">
+      <object class="GtkMenuItem" id="MenuView-HideWhitespace">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:HideWhitespace</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator101">
+      <object class="GtkSeparatorMenuItem" id="MenuView-separator1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenubarD">
+      <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="label" translatable="yes" context="notebookbar_groupedbar_full|MenubarView">Menubar</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SidebarD1">
+      <object class="GtkMenuItem" id="MenuView-Sidebar">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:Sidebar</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="StatusBarVisibleD">
+      <object class="GtkMenuItem" id="MenuView-StatusBarVisible">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:StatusBarVisible</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator95">
+      <object class="GtkSeparatorMenuItem" id="MenuView-separator2">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="RulerD">
+      <object class="GtkMenuItem" id="MenuView-Ruler">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:Ruler</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="GridVisibleD1">
+      <object class="GtkMenuItem" id="MenuView-GridVisible">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:GridVisible</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="GridUseD1">
+      <object class="GtkMenuItem" id="MenuView-GridUse">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:GridUse</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator96">
+      <object class="GtkSeparatorMenuItem" id="MenuView-separator3">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ViewBoundsD">
+      <object class="GtkMenuItem" id="MenuView-ViewBounds">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ViewBounds</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="TableBoundariesD">
+      <object class="GtkMenuItem" id="MenuView-TableBoundaries">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:TableBoundaries</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ShowGraphicsD">
+      <object class="GtkMenuItem" id="MenuView-ShowGraphics">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ShowGraphics</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator194">
+      <object class="GtkSeparatorMenuItem" id="MenuView-separator4">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MarksD">
+      <object class="GtkMenuItem" id="MenuView-Marks">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:Marks</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="FieldnamesD">
+      <object class="GtkMenuItem" id="MenuView-Fieldnames">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:Fieldnames</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator100">
+      <object class="GtkSeparatorMenuItem" id="MenuView-separator5">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ZoomPageD">
+      <object class="GtkMenuItem" id="MenuView-ZoomPage">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ZoomPage</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ZoomPageWidthD">
+      <object class="GtkMenuItem" id="MenuView-ZoomPageWidth">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ZoomPageWidth</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="FullScreenD">
+      <object class="GtkMenuItem" id="MenuView-FullScreen">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:FullScreen</property>
       </object>
     </child>
   </object>
-  <object class="GtkMenu" id="MenuWrap">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <child>
-      <object class="GtkMenuItem" id="WrapOffD1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:WrapOff</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="WrapOnD1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:WrapOn</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="WrapIdealD1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:WrapIdeal</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="WrapLeftD1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:WrapLeft</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="WrapRightD1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:WrapRight</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="WrapThroughD1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:WrapThrough</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="WrapThroughTransparentD1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:WrapThroughTransparent</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="WrapContourD1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:WrapContour</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="WrapAnchorOnlyD1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:WrapAnchorOnly</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="separator142">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="TextWrapD1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:TextWrap</property>
-      </object>
-    </child>
-  </object>
   <object class="GtkGrid" id="NotebookBar">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -3375,10 +3379,10 @@
                                 <property name="label" translatable="yes" context="notebookbar_groupedbar_full|MenuButton">_Menu</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="relief">none</property>
                                 <property name="use_underline">True</property>
-                                <property name="focus_on_click">False</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -3428,10 +3432,10 @@
                                 <property name="label" translatable="yes" context="notebookbar_groupedbar_full|ToolsButton">_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="relief">none</property>
                                 <property name="use_underline">True</property>
-                                <property name="focus_on_click">False</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -3483,10 +3487,10 @@
                                 <property name="label" translatable="yes" context="notebookbar_groupedbar_full|HelpButton">_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="relief">none</property>
                                 <property name="use_underline">True</property>
-                                <property name="focus_on_click">False</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -3591,11 +3595,11 @@
                                 <property name="label" translatable="yes" context="notebookbar_groupedbar_full|FileButton">_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="halign">start</property>
                                 <property name="relief">none</property>
                                 <property name="use_underline">True</property>
-                                <property name="focus_on_click">False</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -3829,11 +3833,11 @@
                                 <property name="label" translatable="yes" context="notebookbar_groupedbar_full|EditButton">_Edit</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="halign">start</property>
                                 <property name="relief">none</property>
                                 <property name="use_underline">True</property>
-                                <property name="focus_on_click">False</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -4026,11 +4030,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|StyleButton">St_yles</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="halign">start</property>
                                         <property name="relief">none</property>
                                         <property name="use_underline">True</property>
-                                        <property name="focus_on_click">False</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -4311,11 +4315,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|FormatButton">F_ormat</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="halign">start</property>
                                         <property name="relief">none</property>
                                         <property name="use_underline">True</property>
-                                        <property name="focus_on_click">False</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -4661,11 +4665,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|ParagraphButton">_Paragraph</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="halign">start</property>
                                         <property name="relief">none</property>
                                         <property name="use_underline">True</property>
-                                        <property name="focus_on_click">False</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -4900,11 +4904,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|InsertButton">_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="halign">start</property>
                                         <property name="relief">none</property>
                                         <property name="use_underline">True</property>
-                                        <property name="focus_on_click">False</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -5129,11 +5133,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|ReferenceButton">Referen_ce</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="halign">start</property>
                                         <property name="relief">none</property>
                                         <property name="use_underline">True</property>
-                                        <property name="focus_on_click">False</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -5331,11 +5335,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|ReviewButton">_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="halign">start</property>
                                         <property name="relief">none</property>
                                         <property name="use_underline">True</property>
-                                        <property name="focus_on_click">False</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -5481,11 +5485,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|ViewButton">_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="halign">start</property>
                                         <property name="relief">none</property>
                                         <property name="use_underline">True</property>
-                                        <property name="focus_on_click">False</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -5743,11 +5747,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|GraphicButton">Image</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="halign">start</property>
                                         <property name="relief">none</property>
                                         <property name="use_underline">True</property>
-                                        <property name="focus_on_click">False</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -6174,11 +6178,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|ArrangeButton">_Arrange</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="halign">start</property>
                                         <property name="relief">none</property>
                                         <property name="use_underline">True</property>
-                                        <property name="focus_on_click">False</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -6347,11 +6351,11 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_full|ColorButton">C_olor</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="halign">start</property>
                                     <property name="relief">none</property>
                                     <property name="use_underline">True</property>
-                                    <property name="focus_on_click">False</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -6598,11 +6602,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|GridButton">_Grid</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="halign">start</property>
                                         <property name="relief">none</property>
                                         <property name="use_underline">True</property>
-                                        <property name="focus_on_click">False</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -6776,11 +6780,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|StyleButton">St_yles</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="halign">start</property>
                                         <property name="relief">none</property>
                                         <property name="use_underline">True</property>
-                                        <property name="focus_on_click">False</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -7061,11 +7065,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|FormatButton">F_ormat</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="halign">start</property>
                                         <property name="relief">none</property>
                                         <property name="use_underline">True</property>
-                                        <property name="focus_on_click">False</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -7411,11 +7415,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|ParagraphButton">_Paragraph</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="halign">start</property>
                                         <property name="relief">none</property>
                                         <property name="use_underline">True</property>
-                                        <property name="focus_on_click">False</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -7636,11 +7640,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|TableButton">T_able</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="halign">start</property>
                                         <property name="relief">none</property>
                                         <property name="use_underline">True</property>
-                                        <property name="focus_on_click">False</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -7835,11 +7839,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|RowsColumnsButton">R_ows</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="halign">start</property>
                                         <property name="relief">none</property>
                                         <property name="use_underline">True</property>
-                                        <property name="focus_on_click">False</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -8037,11 +8041,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|MergeButton">_Merge</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="halign">start</property>
                                         <property name="relief">none</property>
                                         <property name="use_underline">True</property>
-                                        <property name="focus_on_click">False</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -8203,7 +8207,7 @@
                                     <child>
                                       <object class="sfxlo-NotebookbarToolBox" id="second30">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">FalTruese</property>
+                                        <property name="can_focus">False</property>
                                         <property name="toolbar_style">both-horiz</property>
                                         <property name="show_arrow">False</property>
                                         <child>
@@ -8266,11 +8270,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|SelectButton">Sele_ct</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="halign">start</property>
                                         <property name="relief">none</property>
                                         <property name="use_underline">True</property>
-                                        <property name="focus_on_click">False</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -8495,11 +8499,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|CalculateButton">_Calc</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="halign">start</property>
                                         <property name="relief">none</property>
                                         <property name="use_underline">True</property>
-                                        <property name="focus_on_click">False</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -8724,11 +8728,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|ReferenceButton">Referen_ce</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="halign">start</property>
                                         <property name="relief">none</property>
                                         <property name="use_underline">True</property>
-                                        <property name="focus_on_click">False</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -8861,11 +8865,11 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_full|LanguageButton">_Language</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="halign">start</property>
                                     <property name="relief">none</property>
                                     <property name="use_underline">True</property>
-                                    <property name="focus_on_click">False</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -9090,11 +9094,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|ReviewButton">_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="halign">start</property>
                                         <property name="relief">none</property>
                                         <property name="use_underline">True</property>
-                                        <property name="focus_on_click">False</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -9303,11 +9307,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|CommentsButton">_Comments</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="halign">start</property>
                                         <property name="relief">none</property>
                                         <property name="use_underline">True</property>
-                                        <property name="focus_on_click">False</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -9506,11 +9510,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|CompareButton">Com_pare</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="halign">start</property>
                                         <property name="relief">none</property>
                                         <property name="use_underline">True</property>
-                                        <property name="focus_on_click">False</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -9656,11 +9660,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|ViewButton">_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="halign">start</property>
                                         <property name="relief">none</property>
                                         <property name="use_underline">True</property>
-                                        <property name="focus_on_click">False</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -10102,11 +10106,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|DrawButton">D_raw</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="halign">start</property>
                                         <property name="relief">none</property>
                                         <property name="use_underline">True</property>
-                                        <property name="focus_on_click">False</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -10471,11 +10475,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|DrawEditButton">_Edit</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="halign">start</property>
                                         <property name="relief">none</property>
                                         <property name="use_underline">True</property>
-                                        <property name="focus_on_click">False</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -10698,31 +10702,53 @@
                                         <property name="can_focus">False</property>
                                         <property name="orientation">vertical</property>
                                         <child>
-                                          <object class="svtlo-ManagedMenuButton" id="wrapb:MenuWrap">
-                                            <property name="label" translatable="yes" context="notebookbar_groupedbar_full|WrapButton">Wrap</property>
+                                          <object class="sfxlo-NotebookbarToolBox" id="Wrap">
                                             <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
-                                            <property name="receives_default">False</property>
-                                            <property name="relief">none</property>
-                                            <property name="focus_on_click">False</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="valign">end</property>
+                                            <property name="vexpand">True</property>
+                                            <property name="toolbar_style">both-horiz</property>
+                                            <property name="show_arrow">False</property>
+                                            <child>
+                                              <object class="GtkToolButton" id="TextWrap">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">False</property>
+                                                <property name="action_name">.uno:TextWrap</property>
+                                              </object>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="homogeneous">True</property>
+                                              </packing>
+                                            </child>
                                           </object>
                                           <packing>
-                                            <property name="expand">False</property>
+                                            <property name="expand">True</property>
                                             <property name="fill">True</property>
                                             <property name="position">0</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="svtlo-ManagedMenuButton" id="alignb:MenuAlign">
-                                            <property name="label" translatable="yes" context="notebookbar_groupedbar_full|AlignButton">Align</property>
+                                          <object class="sfxlo-NotebookbarToolBox" id="Align">
                                             <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
-                                            <property name="receives_default">False</property>
-                                            <property name="relief">none</property>
-                                            <property name="focus_on_click">False</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="valign">end</property>
+                                            <property name="vexpand">True</property>
+                                            <property name="toolbar_style">both-horiz</property>
+                                            <property name="show_arrow">False</property>
+                                            <child>
+                                              <object class="GtkToolButton" id="ObjectAlign">
+                                                <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="expand">False</property>
+                                            <property name="expand">True</property>
                                             <property name="fill">True</property>
                                             <property name="position">1</property>
                                           </packing>
@@ -10750,11 +10776,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|ArrangeButton">_Arrange</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="halign">start</property>
                                         <property name="relief">none</property>
                                         <property name="use_underline">True</property>
-                                        <property name="focus_on_click">False</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -10917,11 +10943,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|GridButton">_Grid</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="halign">start</property>
                                         <property name="relief">none</property>
                                         <property name="use_underline">True</property>
-                                        <property name="focus_on_click">False</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -11119,11 +11145,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|GroupButton">Grou_p</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="halign">start</property>
                                         <property name="relief">none</property>
                                         <property name="use_underline">True</property>
-                                        <property name="focus_on_click">False</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -11296,11 +11322,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|3DButton">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="halign">start</property>
                                         <property name="relief">none</property>
                                         <property name="use_underline">True</property>
-                                        <property name="focus_on_click">False</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -11605,11 +11631,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|FormatButton">F_ormat</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="halign">start</property>
                                         <property name="relief">none</property>
                                         <property name="use_underline">True</property>
-                                        <property name="focus_on_click">False</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -11870,11 +11896,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|ParagraphButton">_Paragraph</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="halign">start</property>
                                         <property name="relief">none</property>
                                         <property name="use_underline">True</property>
-                                        <property name="focus_on_click">False</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -12047,11 +12073,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|ViewButton">_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="halign">start</property>
                                         <property name="relief">none</property>
                                         <property name="use_underline">True</property>
-                                        <property name="focus_on_click">False</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -12201,11 +12227,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|InsertButton">_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="halign">start</property>
                                         <property name="relief">none</property>
                                         <property name="use_underline">True</property>
-                                        <property name="focus_on_click">False</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -12649,11 +12675,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|MediaButton">_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="halign">start</property>
                                         <property name="relief">none</property>
                                         <property name="use_underline">True</property>
-                                        <property name="focus_on_click">False</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -12883,11 +12909,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|FrameButton">F_rame</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="halign">start</property>
                                         <property name="relief">none</property>
                                         <property name="use_underline">True</property>
-                                        <property name="focus_on_click">False</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -13314,11 +13340,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|ArrangeButton">_Arrange</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="halign">start</property>
                                         <property name="relief">none</property>
                                         <property name="use_underline">True</property>
-                                        <property name="focus_on_click">False</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -13480,11 +13506,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|GridButton">_Grid</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="halign">start</property>
                                         <property name="relief">none</property>
                                         <property name="use_underline">True</property>
-                                        <property name="focus_on_click">False</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -13630,11 +13656,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|ViewButton">_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="halign">start</property>
                                         <property name="relief">none</property>
                                         <property name="use_underline">True</property>
-                                        <property name="focus_on_click">False</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -13914,10 +13940,10 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|PrintMenuButton">_Print</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="relief">none</property>
                                         <property name="use_underline">True</property>
-                                        <property name="focus_on_click">False</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -14146,10 +14172,10 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|PrintMenuButton">Slide 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="relief">none</property>
                                         <property name="use_underline">True</property>
-                                        <property name="focus_on_click">False</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>