NB Implementations: update for better maintenance and sync

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

3 files changed, 1588 insertions, 2168 deletions

diff --git a/sd/uiconfig/simpress/ui/notebookbar.ui b/sd/uiconfig/simpress/ui/notebookbar.ui
index 7dbfe87e1201..2986e543bd88 100644
--- a/sd/uiconfig/simpress/ui/notebookbar.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar.ui
@@ -323,63 +323,71 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="AutoPilotMenuD">
+      <object class="GtkMenuItem" id="AddDirectD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:AutoPilotMenu</property>
+        <property name="action_name">.uno:AddDirect</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator61">
+      <object class="GtkMenuItem" id="RecentFileListD">
         <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="ReloadD">
+      <object class="GtkMenuItem" id="CloseDocD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:Reload</property>
+        <property name="action_name">.uno:CloseDoc</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="VersionDialogD">
+      <object class="GtkSeparatorMenuItem" id="separator39">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:VersionDialog</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator39">
+      <object class="GtkMenuItem" id="SaveD">
         <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="CheckOutD">
+      <object class="GtkMenuItem" id="SaveAsD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:CheckOut</property>
+        <property name="action_name">.uno:SaveAs</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="CancelCheckOutD">
+      <object class="GtkMenuItem" id="SaveAsRemoteD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:CancelCheckOut</property>
+        <property name="action_name">.uno:SaveAsRemote</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="CheckInD">
+      <object class="GtkMenuItem" id="NewGlobalDocD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:CheckIn</property>
+        <property name="action_name">.uno:NewGlobalDoc</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator43">
+      <object class="GtkSeparatorMenuItem" id="separator61">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="ExportToD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:ExportTo</property>
       </object>
     </child>
     <child>
@@ -410,6 +418,13 @@
       </object>
     </child>
     <child>
+      <object class="GtkMenuItem" id="SendMailDocAsPDFD">
+        <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">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -417,23 +432,23 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="NewGlobalDocD">
+      <object class="GtkSeparatorMenuItem" id="separator48">
         <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="separator48">
+      <object class="GtkMenuItem" id="PrintPreviewD">
         <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="WebHtmlD">
+      <object class="GtkMenuItem" id="PrintDefaultD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:WebHtml</property>
+        <property name="action_name">.uno:PrintDefault</property>
       </object>
     </child>
     <child>
@@ -450,17 +465,191 @@
       </object>
     </child>
     <child>
+      <object class="GtkMenuItem" id="SignatureD">
+        <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">
         <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">
+        <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="separator43">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="QuitD">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:Quit</property>
+      </object>
+    </child>
   </object>
   <object class="GtkMenu" id="MenuGraphic">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
+      <object class="GtkMenuItem" id="CropD1">
+        <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="ExternalEditD1">
+        <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="ChangePictureD1">
+        <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="CompressGraphicD1">
+        <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="SaveGraphicD1">
+        <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="separator67">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="ObjectMirrorVerticalD">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:ObjectMirrorVertical</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="ObjectMirrorHorizontalD">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:ObjectMirrorHorizontal</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="separator124">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="ChangeBezier1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:ChangeBezier</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="ChangePolygonD1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:ChangePolygon</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="convert_to_contourD1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:convert_to_contour</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="ConvertInto3DD1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:ConvertInto3D</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="ConvertInto3DLatheFastD1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:ConvertInto3DLatheFast</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="ConvertIntoBitmapD1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:ConvertIntoBitmap</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="ConvertIntoMetaFileD1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:ConvertIntoMetaFile</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="separator128">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="ImageMapDialogD1">
+        <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="separator142">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="AnimationEffectsD">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:AnimationEffects</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="ObjectTitleDescription1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:ObjectTitleDescription</property>
+      </object>
+    </child>
+  </object>
+  <object class="GtkMenu" id="MenuGraphic2">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <child>
       <object class="GtkMenuItem" id="InsertCaptionDialogD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -751,6 +940,19 @@
       </object>
     </child>
     <child>
+      <object class="GtkMenuItem" id="DonationD1">
+        <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="separator100">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
       <object class="GtkMenuItem" id="SafeModeD1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -758,7 +960,15 @@
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator100">
+      <object class="GtkMenuItem" id="UpdateMenuD">
+        <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" context="notebookbar|Help"  translatable="yes">~Check for Updates...</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="separator113">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -1075,24 +1285,17 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="TitlePageDialogD1">
-        <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="PhotoAlbumDialogD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertBreak</property>
+        <property name="action_name">.uno:PhotoAlbumDialog</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertSectionD">
+      <object class="GtkMenuItem" id="AnimationObjectsD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertSection</property>
+        <property name="action_name">.uno:AnimationObjects</property>
       </object>
     </child>
     <child>
@@ -1109,41 +1312,21 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertAVMediaD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertAVMedia</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="separator40">
+      <object class="GtkMenuItem" id="TwainSelectD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:TwainSelect</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertFrameInteractD">
-        <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="InsertFrameD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertFrame</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="InsertObjectFloatingFrameD">
+      <object class="GtkMenuItem" id="InsertAVMediaD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertObjectFloatingFrame</property>
+        <property name="action_name">.uno:InsertAVMedia</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator76">
+      <object class="GtkSeparatorMenuItem" id="separator4">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -1156,36 +1339,30 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertSignatureLineD">
+      <object class="GtkMenuItem" id="ImportFromFile">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertSignatureLine</property>
+        <property name="action_name">.uno:ImportFromFile</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator42">
+      <object class="GtkMenuItem" id="InsertMathD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:InsertMath</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertDocD">
-        <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="InsertEnvelopeD">
+      <object class="GtkSeparatorMenuItem" id="separator40">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertEnvelope</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator4">
+      <object class="GtkMenuItem" id="DrawTextD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:Text</property>
       </object>
     </child>
     <child>
@@ -1196,267 +1373,57 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="EditGlossaryD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:EditGlossary</property>
-      </object>
-    </child>
-  </object>
-  <object class="GtkMenu" id="MenuPage">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <child>
-      <object class="GtkMenuItem" id="AttributePageSizeD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:AttributePageSize</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="PageMarginD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:PageMargin</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="OrientationD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Orientation</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="PageColumnTypeD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:PageColumnType</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="separator190">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="TitlePageDialogD">
-        <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="WatermarkD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Watermark</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="separator192">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="InsertBreak">
+      <object class="GtkMenuItem" id="InsertObjectFloatingFrame">
         <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="LineNumberingDialog">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:LineNumberingDialog</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="separator193">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="UpdateAllD1">
-        <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="WrapOnE">
-        <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="WrapIdealD2">
-        <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="WrapLeftD">
-        <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">
-        <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="WrapThroughD2">
-        <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="WrapThroughTransparencyToggleD1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:WrapThroughTransparencyToggle</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="WrapContourD2">
-        <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="WrapAnchorOnlyD2">
-        <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="TextWrapD2">
-        <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="separator195">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="ObjectAlignLeftD2">
-        <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="AlignCenterD2">
-        <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="AlignUpD2">
-        <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="ObjectAlignRightD2">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ObjectAlignRight</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="AlignMiddleD2">
-        <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="AlignDownD2">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:AlignDown</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="separator191">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="BringToFrontD2">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:BringToFront</property>
+        <property name="action_name">.uno:InsertObjectFloatingFrame</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ObjectForwardOneD2">
+      <object class="GtkSeparatorMenuItem" id="separator42">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:ObjectForwardOne</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ObjectBackOneD2">
+      <object class="GtkMenuItem" id="HyperlinkDialogD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:ObjectBackOne</property>
+        <property name="action_name">.uno:HyperlinkDialog</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SendToBackD2">
+      <object class="GtkMenuItem" id="CapturePointD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:SendToBack</property>
+        <property name="action_name">.uno:CapturePoint</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SetObjectToForegroundD2">
+      <object class="GtkSeparatorMenuItem" id="separator76">
         <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="SetObjectToBackgroundD2">
+      <object class="GtkMenuItem" id="InsertPageFieldD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:SetObjectToBackground</property>
+        <property name="action_name">.uno:InsertPageField</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator196">
+      <object class="GtkMenuItem" id="InsertPagesFieldD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:InsertPagesField</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="PageDialogD">
+      <object class="GtkMenuItem" id="HeaderAndFooterD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:PageDialog</property>
+        <property name="action_name">.uno:HeaderAndFooter</property>
       </object>
     </child>
   </object>
@@ -1550,10 +1517,10 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="SpellingAndGrammarDialogD">
+      <object class="GtkMenuItem" id="SpellDialogD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:SpellingAndGrammarDialog</property>
+        <property name="action_name">.uno:SpellDialog</property>
       </object>
     </child>
     <child>
@@ -1577,21 +1544,7 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SetLanguageSelectionMenuD1">
-        <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">
-        <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="SetLanguageAllTextMenuD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:SetLanguageAllTextMenu</property>
@@ -1604,35 +1557,35 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="HyphenateD1">
+      <object class="GtkMenuItem" id="HyphenationD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:Hyphenate</property>
+        <property name="action_name">.uno:Hyphenation</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ChineseConversionD1">
+      <object class="GtkMenuItem" id="ChineseConversionD">
         <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="HangulHanjaConversionD1">
+      <object class="GtkMenuItem" id="HangulHanjaConversionD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:HangulHanjaConversion</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MoreDictionariesD1">
+      <object class="GtkMenuItem" id="MoreDictionariesD">
         <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="separator117">
+      <object class="GtkSeparatorMenuItem" id="separator116">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -1645,7 +1598,7 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ShowAnnotationsD1">
+      <object class="GtkMenuItem" id="ShowAnnotations">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ShowAnnotations</property>
@@ -1656,25 +1609,24 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="ImportSlideFromFileD">
-        <property name="use_action_appearance">True</property>
+      <object class="GtkMenuItem" id="InsertSlideD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:ImportSlideFromFile</property>
+        <property name="action_name">.uno:InsertSlide</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SummaryPageD">
+      <object class="GtkMenuItem" id="DuplicateSlide">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:SummaryPage</property>
+        <property name="action_name">.uno:DuplicateSlide</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ExpandPageD">
+      <object class="GtkMenuItem" id="DeleteSlide">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:ExpandPage</property>
+        <property name="action_name">.uno:DeleteSlide</property>
       </object>
     </child>
     <child>
@@ -1684,155 +1636,146 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="Layout20">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:AssignLayout?WhatLayout:long=20</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="Layout19">
+      <object class="GtkMenuItem" id="ModifyPageD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:AssignLayout?WhatLayout:long=19</property>
+        <property name="action_name">.uno:ModifyPage</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="Layout0">
+      <object class="GtkMenuItem" id="SlideSetupD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:AssignLayout?WhatLayout:long=0</property>
+        <property name="action_name">.uno:SlideSetup</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="Layout1">
+      <object class="GtkMenuItem" id="SelectBackgroundD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:AssignLayout?WhatLayout:long=1</property>
+        <property name="action_name">.uno:SelectBackground</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="Layout32">
+      <object class="GtkSeparatorMenuItem" id="separator77">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:AssignLayout?WhatLayout:long=32</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator77">
+      <object class="GtkMenuItem" id="InsertMasterPageD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:InsertMasterPage</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="Layout3">
+      <object class="GtkMenuItem" id="DeleteMasterPageD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:AssignLayout?WhatLayout:long=3</property>
+        <property name="action_name">.uno:DeleteMasterPage</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="Layout12">
+      <object class="GtkSeparatorMenuItem" id="separator79">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:AssignLayout?WhatLayout:long=12</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="Layout15">
+      <object class="GtkMenuItem" id="PresentationLayoutD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:AssignLayout?WhatLayout:long=15</property>
+        <property name="action_name">.uno:PresentationLayout</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="Layout14">
+      <object class="GtkMenuItem" id="DisplayMasterBackgroundD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:AssignLayout?WhatLayout:long=14</property>
+        <property name="action_name">.uno:DisplayMasterBackground</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="Layout16">
+      <object class="GtkMenuItem" id="DisplayMasterObjectsD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:AssignLayout?WhatLayout:long=16</property>
+        <property name="action_name">.uno:DisplayMasterObjects</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="Layout18">
+      <object class="GtkSeparatorMenuItem" id="separator157">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:AssignLayout?WhatLayout:long=18</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="Layout34">
+      <object class="GtkMenuItem" id="HideSlideD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:AssignLayout?WhatLayout:long=34</property>
+        <property name="action_name">.uno:HideSlide</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator79">
+      <object class="GtkMenuItem" id="ShowSlideD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:ShowSlide</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="Layout28">
+      <object class="GtkMenuItem" id="RenameSlideD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:AssignLayout?WhatLayout:long=28</property>
+        <property name="action_name">.uno:RenameSlide</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="Layout27">
+      <object class="GtkSeparatorMenuItem" id="separator153">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:AssignLayout?WhatLayout:long=27</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="Layout29">
+      <object class="GtkMenuItem" id="ImportSlideFromFileD">
+        <property name="use_action_appearance">True</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:AssignLayout?WhatLayout:long=29</property>
+        <property name="action_name">.uno:ImportSlideFromFile</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="Layout30">
+      <object class="GtkMenuItem" id="SummaryPageD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:AssignLayout?WhatLayout:long=30</property>
+        <property name="action_name">.uno:SummaryPage</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator90">
+      <object class="GtkMenuItem" id="ExpandPageD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:ExpandPage</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="RestoreEditingViewD">
-        <property name="use_action_appearance">True</property>
+      <object class="GtkSeparatorMenuItem" id="separator165">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:RestoreEditingView</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator98">
+      <object class="GtkMenuItem" id="MoveSlideUpD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:MoveSlideUp</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="RestoreEditingSlideChangeWindowViewD1">
-        <property name="use_action_appearance">True</property>
+      <object class="GtkMenuItem" id="MoveSlideDownD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:SlideChangeWindow</property>
+        <property name="action_name">.uno:MoveSlideDown</property>
       </object>
     </child>
   </object>
@@ -1895,6 +1838,46 @@
       </object>
     </child>
     <child>
+      <object class="GtkMenuItem" id="CustomAnimationD">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:CustomAnimation</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="separator114">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="OutputQualityColorD2">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:OutputQualityColor</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="OutputQualityGrayscaleD2">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:OutputQualityGrayscale</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="separator127">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="PresentationMinimizerD2">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:PresentationMinimizer</property>
+      </object>
+    </child>
+    <child>
       <object class="GtkMenuItem" id="PresentationDialogD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -2091,284 +2074,307 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="ScriptOrganizerD1">
+      <object class="GtkMenuItem" id="MacroOrganizerD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:ScriptOrganizer</property>
+        <property name="action_name">.uno:MacroOrganizer?TabId:short=1</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MacroSignatureD1">
+      <object class="GtkMenuItem" id="MacroSignatureD">
         <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="MacroOrganizerD1">
+      <object class="GtkMenuItem" id="ScriptOrganizerD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:MacroOrganizer</property>
+        <property name="action_name">.uno:ScriptOrganizer</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator157">
+      <object class="GtkMenuItem" id="ViewDataSourceBrowserD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:ViewDataSourceBrowser</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="OpenXMLFilterSettingsD1">
+      <object class="GtkMenuItem" id="BasicIDEAppearD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:OpenXMLFilterSettings</property>
+        <property name="action_name">.uno:BasicIDEAppear</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="AddressBookSource">
+      <object class="GtkMenuItem" id="RunMacroD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:AddressBookSource</property>
+        <property name="action_name">.uno:RunMacro</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator5">
+      <object class="GtkMenuItem" id="MacroRecorderD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:MacroRecorder</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ExtensionsD">
+      <object class="GtkSeparatorMenuItem" id="separator46">
         <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="OptionsTreeDialogD">
+      <object class="GtkMenuItem" id="PresentationMinimizerD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:OptionsTreeDialog</property>
+        <property name="action_name">.uno:PresentationMinimizer</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator101">
+      <object class="GtkMenuItem" id="BmpMaskD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:BmpMask</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="HelpIndexD1">
+      <object class="GtkMenuItem" id="AVMediaPlayerD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:HelpIndex</property>
+        <property name="action_name">.uno:AVMediaPlayer</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="DocumentationD1">
+      <object class="GtkSeparatorMenuItem" id="separator54">
         <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="separator46">
+      <object class="GtkMenuItem" id="OpenXMLFilterSettingsD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:OpenXMLFilterSettings</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="QuestionAnswersD">
+      <object class="GtkMenuItem" id="PackageManagerDialogD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:QuestionAnswers</property>
+        <property name="action_name">service:com.sun.star.deployment.ui.PackageManagerDialog</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SendFeedbackD">
+      <object class="GtkMenuItem" id="UpdateMenuD2">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:SendFeedback</property>
+        <property name="action_name">vnd.sun.star.job:alias=UpdateCheck</property>
+        <property name="label" context="notebookbar|Tools"  translatable="yes">~Check for Updates...</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SafeModeD">
+      <object class="GtkMenuItem" id="OptionsTreeDialogD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:SafeMode</property>
+        <property name="action_name">.uno:OptionsTreeDialog</property>
       </object>
     </child>
+  </object>
+  <object class="GtkMenu" id="MenuView">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator127">
+      <object class="GtkMenuItem" id="NormalMultiPaneGUID">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:NormalMultiPaneGUI</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="DonationD">
+      <object class="GtkMenuItem" id="OutlineModeD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:Donation</property>
+        <property name="action_name">.uno:OutlineMode</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator54">
+      <object class="GtkMenuItem" id="NotesModeD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:NotesMode</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ShowLicenseD">
+      <object class="GtkMenuItem" id="DiaModeD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:ShowLicense</property>
+        <property name="action_name">.uno:DiaMode</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="AboutD1">
+      <object class="GtkSeparatorMenuItem" id="separator1">
         <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="MenuView">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="ToolbarModeD">
+      <object class="GtkMenuItem" id="SlideMasterPageD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:ToolbarMode</property>
+        <property name="action_name">.uno:SlideMasterPage</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="AvailableToolbarsD">
+      <object class="GtkMenuItem" id="NotesMasterPageD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:AvailableToolbars</property>
+        <property name="action_name">.uno:NotesMasterPage</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="NotebookbarD">
+      <object class="GtkMenuItem" id="HandoutModeD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:Notebookbar</property>
+        <property name="action_name">.uno:HandoutMode</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator103">
+      <object class="GtkSeparatorMenuItem" id="separator5">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="RulerVD">
+      <object class="GtkMenuItem" id="MenubarD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:VRuler</property>
+        <property name="action_name">.uno:Menubar</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="VScroll">
+      <object class="GtkMenuItem" id="Sidebar">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:VScroll</property>
+        <property name="action_name">.uno:Sidebar</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="HScroll">
+      <object class="GtkMenuItem" id="StatusBarVisible">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:HScroll</property>
+        <property name="action_name">.uno:StatusBarVisible</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator105">
+      <object class="GtkSeparatorMenuItem" id="separator117">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ViewBoundsD">
+      <object class="GtkMenuItem" id="LeftPaneImpressD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:ViewBounds</property>
+        <property name="action_name">.uno:LeftPaneImpress</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="TableBoundariesD">
+      <object class="GtkMenuItem" id="ToggleTabBarVisibilityD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:TableBoundaries</property>
+        <property name="action_name">.uno:ToggleTabBarVisibility</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ShowGraphicsD">
+      <object class="GtkMenuItem" id="ShowRulerD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:ShowGraphics</property>
+        <property name="action_name">.uno:ShowRuler</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ShowAnnotationsD">
+      <object class="GtkSeparatorMenuItem" id="separator101">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:ShowAnnotations</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ViewTrackChangesD">
+      <object class="GtkMenuItem" id="GridUseD1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:ViewTrackChanges</property>
+        <property name="action_name">.uno:GridVisible</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator1">
+      <object class="GtkMenuItem" id="GridFrontD">
         <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="GridUseD">
+      <object class="GtkSeparatorMenuItem" id="separator103">
         <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="HelplinesMoveD">
+      <object class="GtkMenuItem" id="HelplinesVisibleD">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:HelplinesVisible</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="HelplinesUseD">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:HelplinesUse</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="separator105">
         <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="separator194">
+      <object class="GtkMenuItem" id="OutputQualityColorD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:OutputQualityColor</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MarksD">
+      <object class="GtkMenuItem" id="OutputQualityGrayscaleD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:Marks</property>
+        <property name="action_name">.uno:OutputQualityGrayscale</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="FieldnamesD">
+      <object class="GtkSeparatorMenuItem" id="separator158">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:Fieldnames</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ShowImeStatusWindowD">
+      <object class="GtkMenuItem" id="ZoomPageD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:ShowImeStatusWindow</property>
+        <property name="action_name">.uno:ZoomPage</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="Zoom100PercentD">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:Zoom100Percent</property>
       </object>
     </child>
   </object>
@@ -6469,54 +6475,19 @@
                               <object class="sfxlo-NotebookbarToolBox" id="LineA21">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="toolbar_style">icons</property>
+                                <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="FirstPage">
+                                  <object class="GtkToolButton" id="MovePageUp">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:FirstPage</property>
+                                    <property name="action_name">.uno:MovePageUp</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="homogeneous">True</property>
                                   </packing>
                                 </child>
-                                <child>
-                                  <object class="GtkToolButton" id="PreviousPage">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:PreviousPage</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">False</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="NextPage">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="halign">start</property>
-                                    <property name="action_name">.uno:NextPage</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">False</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="LastPage">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="halign">start</property>
-                                    <property name="action_name">.uno:LastPage</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">False</property>
-                                  </packing>
-                                </child>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -6528,31 +6499,9 @@
                               <object class="sfxlo-NotebookbarToolBox" id="LineB23">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="toolbar_style">icons</property>
+                                <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="MovePageFirst">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:MovePageFirst</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">False</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="MovePageUp">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:MovePageUp</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
                                   <object class="GtkToolButton" id="MovePageDown">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
@@ -6564,18 +6513,6 @@
                                     <property name="homogeneous">False</property>
                                   </packing>
                                 </child>
-                                <child>
-                                  <object class="GtkToolButton" id="MovePageLast">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="halign">start</property>
-                                    <property name="action_name">.uno:MovePageLast</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">False</property>
-                                  </packing>
-                                </child>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -6739,31 +6676,6 @@
                         <property name="valign">center</property>
                         <property name="vexpand">True</property>
                         <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom44">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="MasterLayouts">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:MasterLayouts</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
                           <object class="GtkBox" id="GroupB57">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
@@ -9689,7 +9601,7 @@
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">True</property>
-                            <property name="position">1</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
@@ -9715,22 +9627,61 @@
                                     <property name="homogeneous">True</property>
                                   </packing>
                                 </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="sfxlo-NotebookbarToolBox" id="second17">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="toolbar_style">both-horiz</property>
+                                <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="CompressGraphic">
+                                  <object class="GtkToolButton" id="SaveGraphic1">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:CompressGraphic</property>
+                                    <property name="action_name">.uno:SaveGraphic</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="homogeneous">True</property>
                                   </packing>
                                 </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkBox" id="GroupB45">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="valign">center</property>
+                            <property name="orientation">vertical</property>
+                            <child>
+                              <object class="sfxlo-NotebookbarToolBox" id="first1">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="toolbar_style">both-horiz</property>
+                                <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="ChangePicture">
+                                  <object class="GtkToolButton" id="CompressGraphic">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:ChangePicture</property>
+                                    <property name="action_name">.uno:CompressGraphic</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -9745,24 +9696,50 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="second17">
+                              <object class="sfxlo-NotebookbarToolBox" id="second1">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="MirrorVert">
+                                  <object class="GtkToolButton" id="ChangePicture1">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:MirrorVert</property>
+                                    <property name="action_name">.uno:ChangePicture</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="homogeneous">True</property>
                                   </packing>
                                 </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkBox" id="GroupB50">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="valign">center</property>
+                            <property name="orientation">vertical</property>
+                            <child>
+                              <object class="sfxlo-NotebookbarToolBox" id="first2">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="toolbar_style">both-horiz</property>
+                                <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="MirrorHorz">
+                                  <object class="GtkToolButton" id="MirrorHorz2">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:MirrorHorz</property>
@@ -9772,11 +9749,24 @@
                                     <property name="homogeneous">True</property>
                                   </packing>
                                 </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="sfxlo-NotebookbarToolBox" id="second2">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="toolbar_style">both-horiz</property>
+                                <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="SaveGraphic">
+                                  <object class="GtkToolButton" id="MirrorVert2">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:SaveGraphic</property>
+                                    <property name="action_name">.uno:MirrorVert</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -9794,7 +9784,7 @@
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">True</property>
-                            <property name="position">2</property>
+                            <property name="position">3</property>
                           </packing>
                         </child>
                         <child>
@@ -9809,7 +9799,7 @@
                             <property name="expand">False</property>
                             <property name="fill">True</property>
                             <property name="padding">5</property>
-                            <property name="position">3</property>
+                            <property name="position">4</property>
                           </packing>
                         </child>
                       </object>
@@ -9856,21 +9846,75 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="GraphicFilterToolboxGroup">
+                              <object class="GtkBox" id="GroupB35">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
+                                <property name="valign">center</property>
                                 <child>
-                                  <object class="GtkMenuToolButton" id="GraphicFilterToolbox1">
-                                    <property name="use_action_appearance">False</property>
+                                  <object class="sfxlo-NotebookbarToolBox" id="GraphicFilterToolboxGroup">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:GraphicFilterToolbox</property>
+                                    <property name="toolbar_style">both-horiz</property>
+                                    <property name="show_arrow">False</property>
+                                    <child>
+                                      <object class="GtkMenuToolButton" id="GraphicFilterToolbox1">
+                                        <property name="use_action_appearance">False</property>
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="action_name">.uno:GraphicFilterToolbox</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="homogeneous">False</property>
+                                      </packing>
+                                    </child>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
-                                    <property name="homogeneous">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="sfxlo-NotebookbarToolBox" id="SectionBottom18">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="halign">end</property>
+                                    <property name="hexpand">True</property>
+                                    <property name="toolbar_style">icons</property>
+                                    <property name="show_arrow">False</property>
+                                    <property name="icon_size">1</property>
+                                    <child>
+                                      <object class="GtkToolButton" id="FormatLine2">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="valign">center</property>
+                                        <property name="vexpand">True</property>
+                                        <property name="action_name">.uno:FormatLine</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="homogeneous">True</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkToolButton" id="FormatArea1">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="valign">center</property>
+                                        <property name="vexpand">True</property>
+                                        <property name="action_name">.uno:FormatArea</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="homogeneous">True</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">1</property>
                                   </packing>
                                 </child>
                               </object>
@@ -9888,24 +9932,57 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkBox" id="GroupB71">
+                          <object class="GtkSeparator" id="separator123">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="margin_top">5</property>
+                            <property name="margin_bottom">5</property>
+                            <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="padding">5</property>
+                            <property name="position">3</property>
+                          </packing>
+                        </child>
+                        <style>
+                          <class name="priority-6"/>
+                        </style>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="sfxlo-OptionalBox" id="ColorSection1">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="valign">center</property>
+                        <property name="margin_right">5</property>
+                        <property name="vexpand">True</property>
+                        <child>
+                          <object class="GtkBox" id="GroupB75">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="valign">center</property>
                             <property name="orientation">vertical</property>
                             <child>
-                              <object class="sfxlo-SidebarToolBox" id="colorbox1">
+                              <object class="sfxlo-SidebarToolBox" id="colorbox3">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkMenuToolButton" id="GrafLuminance1">
+                                  <object class="GtkMenuToolButton" id="GrafLuminance2">
                                     <property name="use_action_appearance">False</property>
                                     <property name="width_request">130</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="valign">center</property>
+                                    <property name="margin_right">5</property>
                                     <property name="action_name">.uno:GrafLuminance</property>
                                   </object>
                                   <packing>
@@ -9913,14 +9990,28 @@
                                     <property name="homogeneous">False</property>
                                   </packing>
                                 </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="sfxlo-SidebarToolBox" id="colorbox4">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="toolbar_style">both-horiz</property>
+                                <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkMenuToolButton" id="GrafContrast2">
+                                  <object class="GtkMenuToolButton" id="GrafTransparence1">
                                     <property name="use_action_appearance">False</property>
                                     <property name="width_request">130</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="valign">center</property>
-                                    <property name="action_name">.uno:GrafContrast</property>
+                                    <property name="margin_right">5</property>
+                                    <property name="action_name">.uno:GrafTransparence</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -9931,31 +10022,73 @@
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">True</property>
-                                <property name="position">0</property>
+                                <property name="position">1</property>
                               </packing>
                             </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <style>
+                          <class name="priority-5"/>
+                        </style>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="sfxlo-OptionalBox" id="ColorSection3">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="valign">center</property>
+                        <property name="vexpand">True</property>
+                        <child>
+                          <object class="GtkBox" id="GroupB78">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="valign">center</property>
+                            <property name="orientation">vertical</property>
                             <child>
-                              <object class="sfxlo-SidebarToolBox" id="colorbox2">
+                              <object class="sfxlo-SidebarToolBox" id="colorbox5">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkMenuToolButton" id="GrafTransparence2">
+                                  <object class="GtkMenuToolButton" id="GrafContrast3">
                                     <property name="use_action_appearance">False</property>
                                     <property name="width_request">130</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="valign">center</property>
-                                    <property name="action_name">.uno:GrafTransparence</property>
+                                    <property name="action_name">.uno:GrafContrast</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="homogeneous">False</property>
                                   </packing>
                                 </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="sfxlo-SidebarToolBox" id="colorbox6">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="toolbar_style">both-horiz</property>
+                                <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkMenuToolButton" id="GrafGamma1">
+                                  <object class="GtkMenuToolButton" id="GrafGamma3">
                                     <property name="use_action_appearance">False</property>
                                     <property name="width_request">130</property>
                                     <property name="visible">True</property>
@@ -9983,7 +10116,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkSeparator" id="separator123">
+                          <object class="GtkSeparator" id="separator90">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="margin_top">5</property>
@@ -9998,13 +10131,13 @@
                           </packing>
                         </child>
                         <style>
-                          <class name="priority-2"/>
+                          <class name="priority-4"/>
                         </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">1</property>
+                        <property name="position">3</property>
                       </packing>
                     </child>
                     <child>
@@ -10034,217 +10167,224 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkBox" id="box22">
+                          <object class="GtkBox" id="AlignGroup2">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
+                            <property name="orientation">vertical</property>
                             <child>
-                              <object class="GtkBox" id="AlignGroup">
+                              <object class="sfxlo-NotebookbarToolBox" id="Align5">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="orientation">vertical</property>
+                                <property name="toolbar_style">icons</property>
+                                <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="Align1">
+                                  <object class="GtkToolButton" id="ObjectAlignLeft1">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="ObjectAlignLeft3">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:ObjectAlignLeft</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="AlignCenter3">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:AlignCenter</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="ObjectAlignRight2">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:ObjectAlignRight</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
+                                    <property name="action_name">.uno:ObjectAlignLeft</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
+                                    <property name="homogeneous">True</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="Align2">
+                                  <object class="GtkToolButton" id="AlignCenter1">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="AlignUp2">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:AlignUp</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="AlignMiddle2">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:AlignMiddle</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="AlignBottom">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:AlignDown</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
+                                    <property name="action_name">.uno:AlignCenter</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">1</property>
+                                    <property name="homogeneous">True</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkToolButton" id="ObjectAlignRight1">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="action_name">.uno:ObjectAlignRight</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="homogeneous">True</property>
                                   </packing>
                                 </child>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">True</property>
-                                <property name="position">2</property>
+                                <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkSeparator" id="separator67">
+                              <object class="sfxlo-NotebookbarToolBox" id="Align6">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="orientation">vertical</property>
+                                <property name="toolbar_style">icons</property>
+                                <property name="show_arrow">False</property>
+                                <child>
+                                  <object class="GtkToolButton" id="AlignUp1">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="action_name">.uno:AlignUp</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="homogeneous">True</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkToolButton" id="AlignMiddle1">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="action_name">.uno:AlignMiddle</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="homogeneous">True</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkToolButton" id="AlignBottom2">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="action_name">.uno:AlignDown</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="homogeneous">True</property>
+                                  </packing>
+                                </child>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">True</property>
-                                <property name="padding">5</property>
-                                <property name="position">3</property>
+                                <property name="position">1</property>
                               </packing>
                             </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator" id="separator98">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="margin_top">5</property>
+                            <property name="margin_bottom">5</property>
+                            <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="padding">5</property>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
+                        <style>
+                          <class name="priority-2"/>
+                        </style>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">4</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="sfxlo-OptionalBox" id="ArrangeSection4">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="valign">center</property>
+                        <property name="vexpand">True</property>
+                        <child>
+                          <object class="GtkBox" id="SendToFrontGroup3">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="orientation">vertical</property>
                             <child>
-                              <object class="GtkBox" id="SendToFrontGroup">
+                              <object class="sfxlo-NotebookbarToolBox" id="OneStep3">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="orientation">vertical</property>
+                                <property name="toolbar_style">icons</property>
+                                <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="OneStep">
+                                  <object class="GtkToolButton" id="AlignBottom6">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="AlignBottom1">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:ObjectForwardOne</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="BringToFront1">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:BringToFront</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
+                                    <property name="action_name">.uno:ObjectForwardOne</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
+                                    <property name="homogeneous">True</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="BackgroundFront">
+                                  <object class="GtkToolButton" id="BringToFront4">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="ObjectBackOne">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:ObjectBackOne</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="SendToBack">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:SendToBack</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
+                                    <property name="action_name">.uno:BringToFront</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">1</property>
+                                    <property name="homogeneous">True</property>
                                   </packing>
                                 </child>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">True</property>
-                                <property name="position">4</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="sfxlo-NotebookbarToolBox" id="BackgroundFront3">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="toolbar_style">icons</property>
+                                <property name="show_arrow">False</property>
+                                <child>
+                                  <object class="GtkToolButton" id="ObjectBackOne3">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="action_name">.uno:ObjectBackOne</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="homogeneous">True</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkToolButton" id="SendToBack3">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="action_name">.uno:SendToBack</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="homogeneous">True</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
                               </packing>
                             </child>
                           </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">True</property>
-                            <property name="position">1</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkSeparator" id="separator124">
+                          <object class="GtkSeparator" id="separator141">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="margin_top">5</property>
@@ -10265,15 +10405,12 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">2</property>
+                        <property name="position">5</property>
                       </packing>
                     </child>
                     <child>
                       <placeholder/>
                     </child>
-                    <child>
-                      <placeholder/>
-                    </child>
                   </object>
                   <packing>
                     <property name="expand">True</property>
diff --git a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui
index d52234590361..8f12c3363126 100644
--- a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui
@@ -3,7 +3,6 @@
 <interface domain="sd">
   <requires lib="gtk+" version="3.18"/>
   <requires lib="LibreOffice" version="1.0"/>
-  <!-- interface-local-resource-path ../../../icon-themes/galaxy/cmd/ -->
   <object class="GtkMenu" id="Menu3D">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -495,57 +494,10 @@
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator68">
+      <object class="GtkMenuItem" id="RestoreEditingView">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="ImageMapDialogD2">
-        <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="separator71">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="SwitchControlDesignModeD2">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SwitchControlDesignMode</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="EditDocD2">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:EditDoc</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="separator141">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="menubarD1">
-        <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_compact|menubarD1">Menubar</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="OptionsTreeDialogD1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:OptionsTreeDialog</property>
+        <property name="action_name">.uno:RestoreEditingView</property>
       </object>
     </child>
   </object>
@@ -560,40 +512,6 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="AutoPilotMenuD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:AutoPilotMenu</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="NewDocD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:NewDoc</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="separator61">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="OpenFromWriterD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:OpenFromWriter</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="OpenRemoteD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:OpenRemote</property>
-      </object>
-    </child>
-    <child>
       <object class="GtkMenuItem" id="RecentFileListD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -601,26 +519,6 @@
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator42">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="ReloadD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Reload</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="VersionDialogD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:VersionDialog</property>
-      </object>
-    </child>
-    <child>
       <object class="GtkMenuItem" id="CloseDocD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -641,13 +539,6 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SaveAsRemoteD">
-        <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="SaveAsD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -655,50 +546,44 @@
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator58">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="CheckOutD">
+      <object class="GtkMenuItem" id="SaveAsRemoteD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:CheckOut</property>
+        <property name="action_name">.uno:SaveAsRemote</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="CancelCheckOutD">
+      <object class="GtkMenuItem" id="NewGlobalDocD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:CancelCheckOut</property>
+        <property name="action_name">.uno:NewGlobalDoc</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="CheckInD">
+      <object class="GtkSeparatorMenuItem" id="separator61">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:CheckIn</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator43">
+      <object class="GtkMenuItem" id="ExportToD">
         <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="ExportToD">
+      <object class="GtkMenuItem" id="ExportToPDFD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:ExportTo</property>
+        <property name="action_name">.uno:ExportToPDF</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ExportToPDFD">
+      <object class="GtkMenuItem" id="ExportToEPUBD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:ExportToPDF</property>
+        <property name="action_name">.uno:ExportToEPUB</property>
       </object>
     </child>
     <child>
@@ -715,17 +600,17 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SendViaBluetoothD">
+      <object class="GtkMenuItem" id="SendMailDocAsPDFD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:SendViaBluetooth</property>
+        <property name="action_name">.uno:SendMailDocAsPDF</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="NewGlobalDocD">
+      <object class="GtkMenuItem" id="SendViaBluetoothD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:NewGlobalDoc</property>
+        <property name="action_name">.uno:SendViaBluetooth</property>
       </object>
     </child>
     <child>
@@ -742,10 +627,10 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="PrintD">
+      <object class="GtkMenuItem" id="PrintDefaultD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:Print</property>
+        <property name="action_name">.uno:PrintDefault</property>
       </object>
     </child>
     <child>
@@ -783,7 +668,7 @@
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator64">
+      <object class="GtkSeparatorMenuItem" id="separator42">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -820,33 +705,6 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="BoldD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Bold</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="ItalicD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Italic</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="UnderlineD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Underline</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="separator5">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
       <object class="GtkMenuItem" id="ShadowedD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -861,13 +719,6 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="StrikeoutD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Strikeout</property>
-      </object>
-    </child>
-    <child>
       <object class="GtkMenuItem" id="OverlineD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -1021,51 +872,58 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="InsertCaptionDialogD">
+      <object class="GtkMenuItem" id="CropD1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertCaptionDialog</property>
+        <property name="action_name">.uno:Crop</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator36">
+      <object class="GtkMenuItem" id="ExternalEditD1">
         <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="CropD">
+      <object class="GtkMenuItem" id="ChangePictureD1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:Crop</property>
+        <property name="action_name">.uno:ChangePicture</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ExternalEditD">
+      <object class="GtkMenuItem" id="CompressGraphicD1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:ExternalEdit</property>
+        <property name="action_name">.uno:CompressGraphic</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ChangePictureD">
+      <object class="GtkMenuItem" id="SaveGraphicD1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:ChangePicture</property>
+        <property name="action_name">.uno:SaveGraphic</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="CompressGraphicD">
+      <object class="GtkSeparatorMenuItem" id="separator36">
         <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="ObjectMirrorVerticalD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:SaveGraphic</property>
+        <property name="action_name">.uno:ObjectMirrorVertical</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="ObjectMirrorHorizontalD">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:ObjectMirrorHorizontal</property>
       </object>
     </child>
     <child>
@@ -1075,17 +933,52 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="FlipVerticalD">
+      <object class="GtkMenuItem" id="ChangeBezier1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:FlipVertical</property>
+        <property name="action_name">.uno:ChangeBezier</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="FlipHorizontalD">
+      <object class="GtkMenuItem" id="ChangePolygonD2">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:FlipHorizontal</property>
+        <property name="action_name">.uno:ChangePolygon</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="convert_to_contourD2">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:convert_to_contour</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="ConvertInto3DD2">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:ConvertInto3D</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="ConvertInto3DLatheFastD2">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:ConvertInto3DLatheFast</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="ConvertIntoBitmapD2">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:ConvertIntoBitmap</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="ConvertIntoMetaFileD2">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:ConvertIntoMetaFile</property>
       </object>
     </child>
     <child>
@@ -1095,17 +988,50 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ImageMapDialogD">
+      <object class="GtkMenuItem" id="ImageMapDialogD1">
         <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="separator142">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="AnimationEffectsD">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:AnimationEffects</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="ObjectTitleDescription1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:ObjectTitleDescription</property>
+      </object>
+    </child>
   </object>
   <object class="GtkMenu" id="MenuGrid">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
+      <object class="GtkMenuItem" id="ShowRuler">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:ShowRuler</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="separator60">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
       <object class="GtkMenuItem" id="GridVisibleD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -1327,24 +1253,10 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="InsertGraphicD1">
-        <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="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="TwainSelect">
+      <object class="GtkMenuItem" id="PhotoAlbumDialogD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:TwainSelect</property>
+        <property name="action_name">.uno:PhotoAlbumDialog</property>
       </object>
     </child>
     <child>
@@ -1355,57 +1267,50 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="PhotoAlbumDialogD">
+      <object class="GtkSeparatorMenuItem" id="separator80">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:PhotoAlbumDialog</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertAVMedia">
+      <object class="GtkMenuItem" id="GalleryD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertAVMedia</property>
+        <property name="action_name">.uno:Gallery</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator80">
+      <object class="GtkMenuItem" id="TwainSelectD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:TwainSelect</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="TextD">
+      <object class="GtkMenuItem" id="InsertAVMediaD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:Text</property>
+        <property name="action_name">.uno:InsertAVMedia</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="FontworkGalleryFloater">
+      <object class="GtkSeparatorMenuItem" id="separator41">
         <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="InsertObjectFloatingFrameD">
-        <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="separator46">
+      <object class="GtkMenuItem" id="InsertObjectD">
         <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="InsertSymbolD1">
+      <object class="GtkMenuItem" id="ImportFromFile">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertSymbol</property>
+        <property name="action_name">.uno:ImportFromFile</property>
       </object>
     </child>
     <child>
@@ -1416,98 +1321,56 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertObjectChartD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertObjectChart</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="InsertTableD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertTable</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="separator84">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="Insert3DModelD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Insert3DModel</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="InsertObjectDD">
-        <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="ImportFromFileD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ImportFromFile</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="separator81">
+      <object class="GtkSeparatorMenuItem" id="separator43">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertPageNumberD">
+      <object class="GtkMenuItem" id="DrawTextD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertPageNumber</property>
+        <property name="action_name">.uno:Text</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertDateFieldFixD">
+      <object class="GtkMenuItem" id="FontworkGalleryFloaterD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertDateFieldFix</property>
+        <property name="action_name">.uno:FontworkGalleryFloater</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertDateFieldVarD">
+      <object class="GtkMenuItem" id="InsertObjectFloatingFrame">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertDateFieldVar</property>
+        <property name="action_name">.uno:InsertObjectFloatingFrame</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertTimeFieldFixD">
+      <object class="GtkSeparatorMenuItem" id="separator46">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertTimeFieldFix</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertTimeFieldVarD">
+      <object class="GtkMenuItem" id="HyperlinkDialogD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertTimeFieldVar</property>
+        <property name="action_name">.uno:HyperlinkDialog</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator82">
+      <object class="GtkMenuItem" id="CapturePointD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:CapturePoint</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertAuthorFieldD">
+      <object class="GtkSeparatorMenuItem" id="separator76">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertAuthorField</property>
       </object>
     </child>
     <child>
@@ -1518,13 +1381,6 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertPageTitleFieldD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertPageTitleField</property>
-      </object>
-    </child>
-    <child>
       <object class="GtkMenuItem" id="InsertPagesFieldD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -1532,181 +1388,12 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertFileFieldD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertFileField</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="separator83">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
       <object class="GtkMenuItem" id="HeaderAndFooterD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:HeaderAndFooter</property>
       </object>
     </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="separator159">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="InsertFootnoteD1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertFootnote</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="InsertEndnoteD1">
-        <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="InsertFootnoteDialogD1">
-        <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="separator160">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="InsertPageNumberFieldD1">
-        <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="InsertFieldCtrlD1">
-        <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="separator161">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="InsertIndexesEntryD1">
-        <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="InsertMultiIndexD1">
-        <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="separator162">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="BibliographyComponentD1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:BibliographyComponent</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="InsertAuthoritiesEntryD1">
-        <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="AddressBookSourceD1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:AddressBookSource</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="separator163">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="UpdateAllD1">
-        <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="RepaginateD1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Repaginate</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="UpdateFieldsD1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:UpdateFields</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="UpdateAllIndexesD1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:UpdateAllIndexes</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="UpdateCurIndexD1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:UpdateCurIndex</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="UpdateAllLinksD1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:UpdateAllLinks</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="UpdateChartsD1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:UpdateCharts</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="CalculateSel1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:CalculateSel</property>
-      </object>
-    </child>
   </object>
   <object class="GtkMenu" id="MenuMasterPage">
     <property name="visible">True</property>
@@ -1925,10 +1612,17 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ParagraphDialogD">
+      <object class="GtkMenuItem" id="ParaspaceIncreaseD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:ParagraphDialog</property>
+        <property name="action_name">.uno:ParaspaceIncrease</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="ParaspaceDecreaseD">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:ParaspaceDecrease</property>
       </object>
     </child>
     <child>
@@ -1959,23 +1653,16 @@
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator57">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="ParaspaceIncreaseD">
+      <object class="GtkSeparatorMenuItem" id="separator5">
         <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="ParagraphDialogD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:ParaspaceDecrease</property>
+        <property name="action_name">.uno:ParagraphDialog</property>
       </object>
     </child>
   </object>
@@ -1983,10 +1670,10 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="SpellingAndGrammarDialogD">
+      <object class="GtkMenuItem" id="SpellDialogD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:SpellingAndGrammarDialog</property>
+        <property name="action_name">.uno:SpellDialog</property>
       </object>
     </child>
     <child>
@@ -2004,23 +1691,9 @@
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator89">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="SetLanguageSelectionMenuD">
+      <object class="GtkSeparatorMenuItem" id="separator47">
         <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">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SetLanguageParagraphMenu</property>
       </object>
     </child>
     <child>
@@ -2031,16 +1704,16 @@
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator90">
+      <object class="GtkSeparatorMenuItem" id="separator112">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="HyphenateD">
+      <object class="GtkMenuItem" id="HyphenationD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:Hyphenate</property>
+        <property name="action_name">.uno:Hyphenation</property>
       </object>
     </child>
     <child>
@@ -2065,7 +1738,7 @@
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator91">
+      <object class="GtkSeparatorMenuItem" id="separator49">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -2078,7 +1751,7 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ShowAnnotationsD">
+      <object class="GtkMenuItem" id="ShowAnnotations">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ShowAnnotations</property>
@@ -2191,15 +1864,7 @@
       <object class="GtkMenuItem" id="menubarD">
         <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_compact|menubarD">Menubar</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="StatusBarVisibleD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:StatusBarVisible</property>
+        <property name="action_name">.uno:Menubar</property>
       </object>
     </child>
     <child>
@@ -2216,13 +1881,6 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ConfigureDialogD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ConfigureDialog</property>
-      </object>
-    </child>
-    <child>
       <object class="GtkMenuItem" id="ToolbarModeD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -2230,16 +1888,10 @@
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator100">
+      <object class="GtkMenuItem" id="AvailableToolbarsD1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="ExtensionsD">
-        <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:AvailableToolbars</property>
       </object>
     </child>
     <child>
@@ -2250,63 +1902,37 @@
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator101">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="HelpIndexD1">
-        <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="ExtendedHelpD1">
-        <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="DocumentationD1">
-        <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="separator127">
+      <object class="GtkSeparatorMenuItem" id="separator55">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="NewWindowD">
+      <object class="GtkMenuItem" id="ExtensionsD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:NewWindow</property>
+        <property name="action_name">service:com.sun.star.deployment.ui.PackageManagerDialog</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="CloseWinD">
+      <object class="GtkMenuItem" id="UpdateMenuD1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:CloseWin</property>
+        <property name="action_name">vnd.sun.star.job:alias=UpdateCheck</property>
+        <property name="label" context="notebookbar_groupedbar_compact|Menu"  translatable="yes">~Check for Updates...</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="WindowListD">
+      <object class="GtkSeparatorMenuItem" id="separator58">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:OpenWindow</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator96">
+      <object class="GtkMenuItem" id="HelpIndexD1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:HelpIndex</property>
       </object>
     </child>
     <child>
@@ -2348,55 +1974,48 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertMasterPageD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertMasterPage</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="DeleteMasterPageD">
+      <object class="GtkMenuItem" id="ModifyPageD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:DeleteMasterPage</property>
+        <property name="action_name">.uno:ModifyPage</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator103">
+      <object class="GtkMenuItem" id="SlideSetupD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:SlideSetup</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ModifyPageD">
+      <object class="GtkMenuItem" id="SelectBackgroundD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:ModifyPage</property>
+        <property name="action_name">.uno:SelectBackground</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SlideSetupD">
+      <object class="GtkSeparatorMenuItem" id="separator104">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:SlideSetup</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SelectBackgroundD">
+      <object class="GtkMenuItem" id="InsertMasterPageD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:SelectBackground</property>
+        <property name="action_name">.uno:InsertMasterPage</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SaveBackgroundD">
+      <object class="GtkMenuItem" id="DeleteMasterPageD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:SaveBackground</property>
+        <property name="action_name">.uno:DeleteMasterPage</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator104">
+      <object class="GtkSeparatorMenuItem" id="separator103">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -2409,13 +2028,6 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MasterLayoutsD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:MasterLayouts</property>
-      </object>
-    </child>
-    <child>
       <object class="GtkMenuItem" id="DisplayMasterBackgroundD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -2463,44 +2075,31 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SummaryPageD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SummaryPage</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="ExpandPageD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ExpandPage</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="separator165">
+      <object class="GtkMenuItem" id="ImportSlideFromFileD">
+        <property name="use_action_appearance">True</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:ImportSlideFromFile</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="FirstSlideD">
+      <object class="GtkMenuItem" id="SummaryPageD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:FirstSlide</property>
+        <property name="action_name">.uno:SummaryPage</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="LastSlideD">
+      <object class="GtkMenuItem" id="ExpandPageD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:LastSlide</property>
+        <property name="action_name">.uno:ExpandPage</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="RestoreEditingViewD">
+      <object class="GtkSeparatorMenuItem" id="separator165">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:RestoreEditingView</property>
       </object>
     </child>
     <child>
@@ -2537,7 +2136,7 @@
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator151">
+      <object class="GtkSeparatorMenuItem" id="separator57">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -2564,7 +2163,7 @@
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator152">
+      <object class="GtkSeparatorMenuItem" id="separator106">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -2577,6 +2176,46 @@
       </object>
     </child>
     <child>
+      <object class="GtkMenuItem" id="CustomAnimationD">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:CustomAnimation</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="separator114">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="OutputQualityColorD2">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:OutputQualityColor</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="OutputQualityGrayscaleD2">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:OutputQualityGrayscale</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="separator127">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="PresentationMinimizerD2">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:PresentationMinimizer</property>
+      </object>
+    </child>
+    <child>
       <object class="GtkMenuItem" id="PresentationDialogD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -2588,43 +2227,45 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="AddressBookSource">
+      <object class="GtkMenuItem" id="MacroOrganizerD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:AddressBookSource</property>
+        <property name="action_name">.uno:MacroOrganizer?TabId:short=1</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator109">
+      <object class="GtkMenuItem" id="MacroSignatureD">
         <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="BibliographyComponent">
+      <object class="GtkMenuItem" id="ScriptOrganizerD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:BibliographyComponent</property>
+        <property name="action_name">.uno:ScriptOrganizer</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ChangeDatabaseFieldD">
+      <object class="GtkMenuItem" id="ViewDataSourceBrowserD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:ChangeDatabaseField</property>
+        <property name="action_name">.uno:ViewDataSourceBrowser</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ViewDataSourceBrowserD">
+      <object class="GtkMenuItem" id="BasicIDEAppearD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:ViewDataSourceBrowser</property>
+        <property name="action_name">.uno:BasicIDEAppear</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator110">
+      <object class="GtkMenuItem" id="RunMacroD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:RunMacro</property>
       </object>
     </child>
     <child>
@@ -2635,58 +2276,65 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="RunMacroD">
+      <object class="GtkSeparatorMenuItem" id="separator51">
         <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="PresentationMinimizerD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:BasicIDEAppear</property>
+        <property name="action_name">.uno:PresentationMinimizer</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ScriptOrganizerD">
+      <object class="GtkMenuItem" id="BmpMaskD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:ScriptOrganizer</property>
+        <property name="action_name">.uno:BmpMask</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MacroSignatureD">
+      <object class="GtkMenuItem" id="AVMediaPlayerD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:MacroSignature</property>
+        <property name="action_name">.uno:AVMediaPlayer</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MacroOrganizerD">
+      <object class="GtkSeparatorMenuItem" id="separator53">
         <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="GtkSeparatorMenuItem" id="separator111">
+      <object class="GtkMenuItem" id="OpenXMLFilterSettingsD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:OpenXMLFilterSettings</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="OpenXMLFilterSettingsD">
+      <object class="GtkMenuItem" id="PackageManagerDialogD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:OpenXMLFilterSettings</property>
+        <property name="action_name">service:com.sun.star.deployment.ui.PackageManagerDialog</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SafeModeD1">
+      <object class="GtkMenuItem" id="UpdateMenuD2">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:SafeMode</property>
+        <property name="action_name">vnd.sun.star.job:alias=UpdateCheck</property>
+        <property name="label" context="notebookbar_groupedbar_compact|Tools"  translatable="yes">~Check for Updates...</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="OptionsTreeDialogD2">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:OptionsTreeDialog</property>
       </object>
     </child>
   </object>
@@ -2722,6 +2370,12 @@
       </object>
     </child>
     <child>
+      <object class="GtkSeparatorMenuItem" id="separator56">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
       <object class="GtkMenuItem" id="SlideMasterPageD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -2749,10 +2403,17 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="AvailableToolbarsD">
+      <object class="GtkMenuItem" id="MenubarD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:AvailableToolbars</property>
+        <property name="action_name">.uno:Menubar</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="Sidebar">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:Sidebar</property>
       </object>
     </child>
     <child>
@@ -2763,6 +2424,12 @@
       </object>
     </child>
     <child>
+      <object class="GtkSeparatorMenuItem" id="separator117">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
       <object class="GtkMenuItem" id="LeftPaneImpressD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -2777,37 +2444,30 @@
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator117">
+      <object class="GtkMenuItem" id="ShowRulerD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:ShowRuler</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ShowGraphicsD">
+      <object class="GtkSeparatorMenuItem" id="separator59">
         <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">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:GridUse</property>
+        <property name="action_name">.uno:GridVisible</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="GridFrontD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:GridFront</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="HelplinesMoveD1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:HelplinesMove</property>
+        <property name="action_name">.uno:GridUse</property>
       </object>
     </child>
     <child>
@@ -2831,13 +2491,6 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="HelplinesFrontD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:HelplinesFront</property>
-      </object>
-    </child>
-    <child>
       <object class="GtkSeparatorMenuItem" id="separator121">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -2858,13 +2511,6 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="OutputQualityBlackWhiteD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:OutputQualityBlackWhite</property>
-      </object>
-    </child>
-    <child>
       <object class="GtkSeparatorMenuItem" id="separator158">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -2878,40 +2524,12 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ZoomPageWidthD">
-        <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="ZoomOptimalD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ZoomOptimal</property>
-      </object>
-    </child>
-    <child>
       <object class="GtkMenuItem" id="Zoom100PercentD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:Zoom100Percent</property>
       </object>
     </child>
-    <child>
-      <object class="GtkMenuItem" id="ZoomD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Zoom</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="ZoomPanningD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ZoomPanning</property>
-      </object>
-    </child>
   </object>
   <object class="GtkGrid" id="NotebookBar">
     <property name="visible">True</property>
@@ -3063,51 +2681,28 @@
               </packing>
             </child>
             <child>
-              <object class="sfxlo-DropdownBox" id="ClipboardSection">
+              <object class="sfxlo-DropdownBox" id="FileSection">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="margin_left">5</property>
                 <property name="baseline_position">bottom</property>
                 <child>
-                  <object class="GtkSeparator" id="separator1">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="orientation">vertical</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="padding">5</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkBox" id="Section1">
+                  <object class="GtkBox" id="Section">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="orientation">vertical</property>
+                    <property name="baseline_position">top</property>
                     <child>
-                      <object class="sfxlo-NotebookbarToolBox" id="SectionBottom41">
+                      <object class="sfxlo-NotebookbarToolBox" id="SectionBottom">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="toolbar_style">icons</property>
                         <property name="show_arrow">False</property>
                         <child>
-                          <object class="GtkMenuToolButton" id="Paste1">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="vexpand">False</property>
-                            <property name="action_name">.uno:Paste</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="homogeneous">True</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkToolButton" id="Undo1">
+                          <object class="GtkMenuToolButton" id="Open">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="action_name">.uno:Undo</property>
+                            <property name="action_name">.uno:Open</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -3115,10 +2710,10 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkToolButton" id="Redo1">
+                          <object class="GtkMenuToolButton" id="Save">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="action_name">.uno:Redo</property>
+                            <property name="action_name">.uno:Save</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -3133,12 +2728,12 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkBox" id="box15">
+                      <object class="GtkBox" id="box12">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
-                          <object class="svtlo-ManagedMenuButton" id="editb:MenuEdit">
-                            <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|editb">_Edit</property>
+                          <object class="svtlo-ManagedMenuButton" id="fileb:MenuFile">
+                            <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|fileb">_File</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -3155,7 +2750,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="ExtBottom10">
+                          <object class="sfxlo-NotebookbarToolBox" id="ExtBottom3">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="halign">end</property>
@@ -3164,21 +2759,10 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">1</property>
                             <child>
-                              <object class="GtkToolButton" id="Cut">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:Cut</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkToolButton" id="Copy">
+                              <object class="GtkToolButton" id="Print">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="action_name">.uno:Copy</property>
+                                <property name="action_name">.uno:Print</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -3203,7 +2787,7 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">True</property>
-                    <property name="position">1</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
               </object>
@@ -3214,43 +2798,40 @@
               </packing>
             </child>
             <child>
-              <object class="GtkSeparator" id="separator122">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="halign">end</property>
-                <property name="orientation">vertical</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="padding">5</property>
-                <property name="pack_type">end</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="sfxlo-DropdownBox" id="FileSection">
+              <object class="sfxlo-DropdownBox" id="ClipboardSection">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="margin_left">5</property>
                 <property name="baseline_position">bottom</property>
                 <child>
-                  <object class="GtkBox" id="Section">
+                  <object class="GtkSeparator" id="separator1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="orientation">vertical</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="padding">5</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox" id="Section1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="orientation">vertical</property>
-                    <property name="baseline_position">top</property>
                     <child>
-                      <object class="sfxlo-NotebookbarToolBox" id="SectionBottom">
+                      <object class="sfxlo-NotebookbarToolBox" id="SectionBottom41">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="toolbar_style">icons</property>
                         <property name="show_arrow">False</property>
                         <child>
-                          <object class="GtkMenuToolButton" id="Open">
+                          <object class="GtkMenuToolButton" id="Paste1">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="action_name">.uno:Open</property>
+                            <property name="vexpand">False</property>
+                            <property name="action_name">.uno:Paste</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -3258,10 +2839,21 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkMenuToolButton" id="Save">
+                          <object class="GtkToolButton" id="Undo1">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="action_name">.uno:Save</property>
+                            <property name="action_name">.uno:Undo</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="homogeneous">True</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkToolButton" id="Redo1">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="action_name">.uno:Redo</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -3276,12 +2868,12 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkBox" id="box12">
+                      <object class="GtkBox" id="box15">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
-                          <object class="svtlo-ManagedMenuButton" id="fileb:MenuFile">
-                            <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|fileb">_File</property>
+                          <object class="svtlo-ManagedMenuButton" id="editb:MenuEdit">
+                            <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|editb">_Edit</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -3298,7 +2890,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="ExtBottom3">
+                          <object class="sfxlo-NotebookbarToolBox" id="ExtBottom10">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="halign">end</property>
@@ -3307,10 +2899,21 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">1</property>
                             <child>
-                              <object class="GtkToolButton" id="Print">
+                              <object class="GtkToolButton" id="Cut">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="action_name">.uno:Print</property>
+                                <property name="action_name">.uno:Cut</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="Copy">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="action_name">.uno:Copy</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -3335,14 +2938,29 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">True</property>
-                    <property name="position">0</property>
+                    <property name="position">1</property>
                   </packing>
                 </child>
               </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="position">4</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkSeparator" id="separator122">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="halign">end</property>
+                <property name="orientation">vertical</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="padding">5</property>
+                <property name="pack_type">end</property>
+                <property name="position">3</property>
               </packing>
             </child>
             <child>
@@ -3387,10 +3005,10 @@
                                     <property name="toolbar_style">both-horiz</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="PresentationCurrentSlide2">
+                                      <object class="GtkToolButton" id="Presentation">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:PresentationCurrentSlide</property>
+                                        <property name="action_name">.uno:Presentation</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -3411,10 +3029,10 @@
                                     <property name="toolbar_style">icons</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="Presentation">
+                                      <object class="GtkToolButton" id="PresentationCurrentSlide2">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:Presentation</property>
+                                        <property name="action_name">.uno:PresentationCurrentSlide</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -4430,10 +4048,10 @@
                                     <property name="toolbar_style">both-horiz</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="PresentationCurrentSlide1">
+                                      <object class="GtkToolButton" id="Presentation1">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:PresentationCurrentSlide</property>
+                                        <property name="action_name">.uno:Presentation</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -4454,10 +4072,10 @@
                                     <property name="toolbar_style">icons</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="Presentation1">
+                                      <object class="GtkToolButton" id="PresentationCurrentSlide1">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:Presentation</property>
+                                        <property name="action_name">.uno:PresentationCurrentSlide</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -5456,10 +5074,10 @@
                                     <property name="toolbar_style">both-horiz</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="PresentationCurrentSlide3">
+                                      <object class="GtkToolButton" id="Presentation2">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:PresentationCurrentSlide</property>
+                                        <property name="action_name">.uno:Presentation</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -5480,10 +5098,10 @@
                                     <property name="toolbar_style">icons</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="Presentation2">
+                                      <object class="GtkToolButton" id="PresentationCurrentSlide3">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:Presentation</property>
+                                        <property name="action_name">.uno:PresentationCurrentSlide</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -8320,10 +7938,10 @@
                                     <property name="toolbar_style">both-horiz</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="PresentationCurrentSlide4">
+                                      <object class="GtkToolButton" id="Presentation3">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:PresentationCurrentSlide</property>
+                                        <property name="action_name">.uno:Presentation</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -8344,10 +7962,10 @@
                                     <property name="toolbar_style">icons</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="Presentation3">
+                                      <object class="GtkToolButton" id="PresentationCurrentSlide4">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:Presentation</property>
+                                        <property name="action_name">.uno:PresentationCurrentSlide</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
diff --git a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui
index f765198cba45..4a2bcd8106df 100644
--- a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui
@@ -594,56 +594,10 @@
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator68">
+      <object class="GtkMenuItem" id="RestoreEditingView">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="ImageMapDialogD2">
-        <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="separator71">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="SwitchControlDesignModeD2">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SwitchControlDesignMode</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="EditDocD2">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:EditDoc</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="separator28">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="menubarD1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:MenuBar</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="OptionsTreeDialogD1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:OptionsTreeDialog</property>
+        <property name="action_name">.uno:RestoreEditingView</property>
       </object>
     </child>
   </object>
@@ -658,40 +612,6 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="AutoPilotMenuD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:AutoPilotMenu</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="NewDocD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:NewDoc</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="separator61">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="OpenFromWriterD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:OpenFromWriter</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="OpenRemoteD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:OpenRemote</property>
-      </object>
-    </child>
-    <child>
       <object class="GtkMenuItem" id="RecentFileListD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -699,26 +619,6 @@
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator42">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="ReloadD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Reload</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="VersionDialogD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:VersionDialog</property>
-      </object>
-    </child>
-    <child>
       <object class="GtkMenuItem" id="CloseDocD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -739,13 +639,6 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SaveAsRemoteD">
-        <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="SaveAsD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -753,50 +646,44 @@
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator58">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="CheckOutD">
+      <object class="GtkMenuItem" id="SaveAsRemoteD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:CheckOut</property>
+        <property name="action_name">.uno:SaveAsRemote</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="CancelCheckOutD">
+      <object class="GtkMenuItem" id="NewGlobalDocD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:CancelCheckOut</property>
+        <property name="action_name">.uno:NewGlobalDoc</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="CheckInD">
+      <object class="GtkSeparatorMenuItem" id="separator61">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:CheckIn</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator43">
+      <object class="GtkMenuItem" id="ExportToD">
         <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="ExportToD">
+      <object class="GtkMenuItem" id="ExportToPDFD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:ExportTo</property>
+        <property name="action_name">.uno:ExportToPDF</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ExportToPDFD">
+      <object class="GtkMenuItem" id="ExportToEPUBD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:ExportToPDF</property>
+        <property name="action_name">.uno:ExportToEPUB</property>
       </object>
     </child>
     <child>
@@ -813,17 +700,17 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SendViaBluetoothD">
+      <object class="GtkMenuItem" id="SendMailDocAsPDFD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:SendViaBluetooth</property>
+        <property name="action_name">.uno:SendMailDocAsPDF</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="NewGlobalDocD">
+      <object class="GtkMenuItem" id="SendViaBluetoothD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:NewGlobalDoc</property>
+        <property name="action_name">.uno:SendViaBluetooth</property>
       </object>
     </child>
     <child>
@@ -840,10 +727,10 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="PrintD">
+      <object class="GtkMenuItem" id="PrintDefaultD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:Print</property>
+        <property name="action_name">.uno:PrintDefault</property>
       </object>
     </child>
     <child>
@@ -881,7 +768,7 @@
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator64">
+      <object class="GtkSeparatorMenuItem" id="separator42">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -918,33 +805,6 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="BoldD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Bold</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="ItalicD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Italic</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="UnderlineD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Underline</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="separator2">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
       <object class="GtkMenuItem" id="ShadowedD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -959,13 +819,6 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="StrikeoutD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Strikeout</property>
-      </object>
-    </child>
-    <child>
       <object class="GtkMenuItem" id="OverlineD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -979,13 +832,6 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertSymbolD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertSymbol</property>
-      </object>
-    </child>
-    <child>
       <object class="GtkMenuItem" id="SuperScript1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -1126,51 +972,58 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="InsertCaptionDialogD">
+      <object class="GtkMenuItem" id="CropD1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertCaptionDialog</property>
+        <property name="action_name">.uno:Crop</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator18">
+      <object class="GtkMenuItem" id="ExternalEditD1">
         <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="CropD">
+      <object class="GtkMenuItem" id="ChangePictureD1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:Crop</property>
+        <property name="action_name">.uno:ChangePicture</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ExternalEditD">
+      <object class="GtkMenuItem" id="CompressGraphicD1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:ExternalEdit</property>
+        <property name="action_name">.uno:CompressGraphic</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ChangePictureD">
+      <object class="GtkMenuItem" id="SaveGraphicD1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:ChangePicture</property>
+        <property name="action_name">.uno:SaveGraphic</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="CompressGraphicD">
+      <object class="GtkSeparatorMenuItem" id="separator18">
         <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="ObjectMirrorVerticalD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:SaveGraphic</property>
+        <property name="action_name">.uno:ObjectMirrorVertical</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="ObjectMirrorHorizontalD">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:ObjectMirrorHorizontal</property>
       </object>
     </child>
     <child>
@@ -1180,17 +1033,52 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="FlipVerticalD">
+      <object class="GtkMenuItem" id="ChangeBezier1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:FlipVertical</property>
+        <property name="action_name">.uno:ChangeBezier</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="FlipHorizontalD">
+      <object class="GtkMenuItem" id="ChangePolygonD2">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:FlipHorizontal</property>
+        <property name="action_name">.uno:ChangePolygon</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="convert_to_contourD2">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:convert_to_contour</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="ConvertInto3DD2">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:ConvertInto3D</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="ConvertInto3DLatheFastD2">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:ConvertInto3DLatheFast</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="ConvertIntoBitmapD2">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:ConvertIntoBitmap</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="ConvertIntoMetaFileD2">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:ConvertIntoMetaFile</property>
       </object>
     </child>
     <child>
@@ -1200,17 +1088,50 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ImageMapDialogD">
+      <object class="GtkMenuItem" id="ImageMapDialogD1">
         <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="separator142">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="AnimationEffectsD">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:AnimationEffects</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="ObjectTitleDescription1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:ObjectTitleDescription</property>
+      </object>
+    </child>
   </object>
   <object class="GtkMenu" id="MenuGrid">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
+      <object class="GtkMenuItem" id="ShowRuler">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:ShowRuler</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="separator28">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
       <object class="GtkMenuItem" id="GridVisibleD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -1453,84 +1374,77 @@
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator95">
+      <object class="GtkSeparatorMenuItem" id="separator94">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="QuestionAnswersD">
+      <object class="GtkMenuItem" id="QuestionAnswersD1">
         <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="SendFeedbackD">
+      <object class="GtkMenuItem" id="SendFeedbackD1">
         <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="SafeModeD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SafeMode</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="separator96">
+      <object class="GtkMenuItem" id="DonationD1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:Donation</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ShowLicenseD">
+      <object class="GtkSeparatorMenuItem" id="separator43">
         <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="SafeModeD1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:About</property>
+        <property name="action_name">.uno:SafeMode</property>
       </object>
     </child>
-  </object>
-  <object class="GtkMenu" id="MenuInsert">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="InsertGraphicD1">
+      <object class="GtkMenuItem" id="UpdateMenuD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertGraphic</property>
+        <property name="action_name">vnd.sun.star.job:alias=UpdateCheck</property>
+        <property name="label" context="notebookbar_groupedbar_full|Help"  translatable="yes">~Check for Updates...</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="Gallery">
+      <object class="GtkSeparatorMenuItem" id="separator113">
         <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="TwainSelect">
+      <object class="GtkMenuItem" id="ShowLicenseD1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:TwainSelect</property>
+        <property name="action_name">.uno:ShowLicense</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="AnimationObjectsD">
+      <object class="GtkMenuItem" id="AboutD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:AnimationObjects</property>
+        <property name="action_name">.uno:About</property>
       </object>
     </child>
+  </object>
+  <object class="GtkMenu" id="MenuInsert">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
     <child>
       <object class="GtkMenuItem" id="PhotoAlbumDialogD">
         <property name="visible">True</property>
@@ -1539,10 +1453,10 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertAVMedia">
+      <object class="GtkMenuItem" id="AnimationObjectsD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertAVMedia</property>
+        <property name="action_name">.uno:AnimationObjects</property>
       </object>
     </child>
     <child>
@@ -1552,153 +1466,111 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="TextD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Text</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="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="InsertObjectFloatingFrameD">
-        <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="separator140">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="InsertSymbolD1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertSymbol</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="InsertMathD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertMath</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="InsertObjectChartD">
+      <object class="GtkMenuItem" id="GalleryD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertObjectChart</property>
+        <property name="action_name">.uno:Gallery</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertTableD">
+      <object class="GtkMenuItem" id="TwainSelectD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertTable</property>
+        <property name="action_name">.uno:TwainSelect</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator84">
+      <object class="GtkMenuItem" id="InsertAVMediaD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:InsertAVMedia</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="Insert3DModelD">
+      <object class="GtkSeparatorMenuItem" id="separator8">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:Insert3DModel</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertObjectDD">
+      <object class="GtkMenuItem" id="InsertObjectD">
         <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="ImportFromFileD">
+      <object class="GtkMenuItem" id="ImportFromFile">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ImportFromFile</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator8">
+      <object class="GtkMenuItem" id="InsertMathD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:InsertMath</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertPageNumberD">
+      <object class="GtkSeparatorMenuItem" id="separator49">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertPageNumber</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertDateFieldFixD">
+      <object class="GtkMenuItem" id="DrawTextD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertDateFieldFix</property>
+        <property name="action_name">.uno:Text</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertDateFieldVarD">
+      <object class="GtkMenuItem" id="FontworkGalleryFloaterD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertDateFieldVar</property>
+        <property name="action_name">.uno:FontworkGalleryFloater</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertTimeFieldFixD">
+      <object class="GtkMenuItem" id="InsertObjectFloatingFrame">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertTimeFieldFix</property>
+        <property name="action_name">.uno:InsertObjectFloatingFrame</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertTimeFieldVarD">
+      <object class="GtkSeparatorMenuItem" id="separator56">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertTimeFieldVar</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator82">
+      <object class="GtkMenuItem" id="HyperlinkDialogD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:HyperlinkDialog</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertAuthorFieldD">
+      <object class="GtkMenuItem" id="CapturePointD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertAuthorField</property>
+        <property name="action_name">.uno:CapturePoint</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertPageFieldD">
+      <object class="GtkSeparatorMenuItem" id="separator76">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertPageField</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertPageTitleFieldD">
+      <object class="GtkMenuItem" id="InsertPageFieldD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertPageTitleField</property>
+        <property name="action_name">.uno:InsertPageField</property>
       </object>
     </child>
     <child>
@@ -1709,181 +1581,12 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertFileFieldD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertFileField</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="separator81">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
       <object class="GtkMenuItem" id="HeaderAndFooterD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:HeaderAndFooter</property>
       </object>
     </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="separator49">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="InsertFootnoteD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertFootnote</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="InsertEndnoteD">
-        <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">
-        <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="separator85">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="InsertPageNumberFieldD">
-        <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">
-        <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="separator88">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="InsertIndexesEntryD">
-        <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">
-        <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="separator86">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="BibliographyComponentD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:BibliographyComponent</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="InsertAuthoritiesEntryD">
-        <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="AddressBookSourceD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:AddressBookSource</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="separator87">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="UpdateAllD">
-        <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="RepaginateD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Repaginate</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="UpdateFieldsD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:UpdateFields</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="UpdateAllIndexesD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:UpdateAllIndexes</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="UpdateCurIndexD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:UpdateCurIndex</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="UpdateAllLinksD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:UpdateAllLinks</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="UpdateChartsD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:UpdateCharts</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="CalculateSel">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:CalculateSel</property>
-      </object>
-    </child>
   </object>
   <object class="GtkMenu" id="MenuMasterPage">
     <property name="visible">True</property>
@@ -2102,10 +1805,17 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ParagraphDialogD">
+      <object class="GtkMenuItem" id="ParaspaceIncreaseD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:ParagraphDialog</property>
+        <property name="action_name">.uno:ParaspaceIncrease</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="ParaspaceDecreaseD">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:ParaspaceDecrease</property>
       </object>
     </child>
     <child>
@@ -2142,17 +1852,10 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ParaspaceIncreaseD">
-        <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="ParagraphDialogD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:ParaspaceDecrease</property>
+        <property name="action_name">.uno:ParagraphDialog</property>
       </object>
     </child>
   </object>
@@ -2160,10 +1863,10 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="SpellingAndGrammarDialogD">
+      <object class="GtkMenuItem" id="SpellDialogD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:SpellingAndGrammarDialog</property>
+        <property name="action_name">.uno:SpellDialog</property>
       </object>
     </child>
     <child>
@@ -2181,23 +1884,9 @@
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator89">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="SetLanguageSelectionMenuD">
-        <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="GtkSeparatorMenuItem" id="separator60">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:SetLanguageParagraphMenu</property>
       </object>
     </child>
     <child>
@@ -2208,16 +1897,16 @@
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator90">
+      <object class="GtkSeparatorMenuItem" id="separator112">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="HyphenateD">
+      <object class="GtkMenuItem" id="HyphenationD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:Hyphenate</property>
+        <property name="action_name">.uno:Hyphenation</property>
       </object>
     </child>
     <child>
@@ -2242,7 +1931,7 @@
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator91">
+      <object class="GtkSeparatorMenuItem" id="separator63">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -2255,7 +1944,7 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ShowAnnotationsD">
+      <object class="GtkMenuItem" id="ShowAnnotations">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ShowAnnotations</property>
@@ -2368,15 +2057,7 @@
       <object class="GtkMenuItem" id="menubarD">
         <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|menubarD">Menubar</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="StatusBarVisibleD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:StatusBarVisible</property>
+        <property name="action_name">.uno:Menubar</property>
       </object>
     </child>
     <child>
@@ -2393,64 +2074,65 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ConfigureDialogD">
+      <object class="GtkMenuItem" id="ToolbarModeD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:ConfigureDialog</property>
+        <property name="action_name">.uno:ToolbarMode</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ToolbarModeD">
+      <object class="GtkMenuItem" id="AvailableToolbarsD1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:ToolbarMode</property>
+        <property name="action_name">.uno:AvailableToolbars</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator97">
+      <object class="GtkMenuItem" id="OptionsTreeDialogD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:OptionsTreeDialog</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ExtensionsD">
+      <object class="GtkSeparatorMenuItem" id="separator55">
         <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="OptionsTreeDialogD">
+      <object class="GtkMenuItem" id="ExtensionsD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:OptionsTreeDialog</property>
+        <property name="action_name">service:com.sun.star.deployment.ui.PackageManagerDialog</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator98">
+      <object class="GtkMenuItem" id="UpdateMenuD1">
         <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" context="notebookbar_groupedbar_full|Menu"  translatable="yes">~Check for Updates...</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="NewWindowD">
+      <object class="GtkSeparatorMenuItem" id="separator58">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:NewWindow</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="CloseWinD">
+      <object class="GtkMenuItem" id="HelpIndexD1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:CloseWin</property>
+        <property name="action_name">.uno:HelpIndex</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="WindowListD">
+      <object class="GtkMenuItem" id="AboutD1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:OpenWindow</property>
+        <property name="action_name">.uno:About</property>
       </object>
     </child>
   </object>
@@ -2459,7 +2141,6 @@
     <property name="can_focus">False</property>
     <child>
       <object class="GtkMenuItem" id="InsertSlideD">
-        <property name="use_action_appearance">True</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertSlide</property>
@@ -2480,62 +2161,54 @@
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator37">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="InsertMasterPageD">
+      <object class="GtkSeparatorMenuItem" id="separator102">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertMasterPage</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="DeleteMasterPageD">
+      <object class="GtkMenuItem" id="ModifyPageD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:DeleteMasterPage</property>
+        <property name="action_name">.uno:ModifyPage</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator36">
+      <object class="GtkMenuItem" id="SlideSetupD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:SlideSetup</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ModifyPageD">
+      <object class="GtkMenuItem" id="SelectBackgroundD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:ModifyPage</property>
+        <property name="action_name">.uno:SelectBackground</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SlideSetupD">
+      <object class="GtkSeparatorMenuItem" id="separator36">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:SlideSetup</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SelectBackgroundD">
+      <object class="GtkMenuItem" id="InsertMasterPageD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:SelectBackground</property>
+        <property name="action_name">.uno:InsertMasterPage</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SaveBackgroundD">
+      <object class="GtkMenuItem" id="DeleteMasterPageD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:SaveBackground</property>
-        <property name="label" translatable="yes" context="notebookbar_groupedbar_full|Quotation2">Quotation</property>
+        <property name="action_name">.uno:DeleteMasterPage</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator38">
+      <object class="GtkSeparatorMenuItem" id="separator103">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -2548,13 +2221,6 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MasterLayoutsD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:MasterLayouts</property>
-      </object>
-    </child>
-    <child>
       <object class="GtkMenuItem" id="DisplayMasterBackgroundD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -2596,50 +2262,37 @@
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator152">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="SummaryPageD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SummaryPage</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="ExpandPageD">
+      <object class="GtkSeparatorMenuItem" id="separator153">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:ExpandPage</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator165">
+      <object class="GtkMenuItem" id="ImportSlideFromFileD">
+        <property name="use_action_appearance">True</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:ImportSlideFromFile</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="FirstSlideD">
+      <object class="GtkMenuItem" id="SummaryPageD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:FirstSlide</property>
+        <property name="action_name">.uno:SummaryPage</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="LastSlideD">
+      <object class="GtkMenuItem" id="ExpandPageD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:LastSlide</property>
+        <property name="action_name">.uno:ExpandPage</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="RestoreEditingViewD">
+      <object class="GtkSeparatorMenuItem" id="separator165">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:RestoreEditingView</property>
       </object>
     </child>
     <child>
@@ -2676,7 +2329,7 @@
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator32">
+      <object class="GtkSeparatorMenuItem" id="separator2">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -2703,7 +2356,7 @@
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator83">
+      <object class="GtkSeparatorMenuItem" id="separator32">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -2716,6 +2369,46 @@
       </object>
     </child>
     <child>
+      <object class="GtkMenuItem" id="CustomAnimationD">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:CustomAnimation</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="separator114">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="OutputQualityColorD2">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:OutputQualityColor</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="OutputQualityGrayscaleD2">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:OutputQualityGrayscale</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="separator75">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="PresentationMinimizerD2">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:PresentationMinimizer</property>
+      </object>
+    </child>
+    <child>
       <object class="GtkMenuItem" id="PresentationDialogD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -2805,82 +2498,83 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="AVMediaPlayerD">
+      <object class="GtkMenuItem" id="MacroOrganizerD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:AVMediaPlayer</property>
+        <property name="action_name">.uno:MacroOrganizer?TabId:short=1</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="BmpMaskD">
+      <object class="GtkMenuItem" id="MacroSignatureD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:BmpMask</property>
+        <property name="action_name">.uno:MacroSignature</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="PresentationMinimizerD">
+      <object class="GtkMenuItem" id="ScriptOrganizerD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:PresentationMinimizer</property>
+        <property name="action_name">.uno:ScriptOrganizer</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator102">
+      <object class="GtkMenuItem" id="ViewDataSourceBrowserD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:ViewDataSourceBrowser</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator100">
+      <object class="GtkMenuItem" id="BasicIDEAppearD">
         <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="MacroRecorderD">
+      <object class="GtkMenuItem" id="RunMacroD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:MacroRecorder</property>
+        <property name="action_name">.uno:RunMacro</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="RunMacroD">
+      <object class="GtkMenuItem" id="MacroRecorderD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:RunMacro</property>
+        <property name="action_name">.uno:MacroRecorder</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="BasicIDEAppearD">
+      <object class="GtkSeparatorMenuItem" id="separator64">
         <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="ScriptOrganizerD">
+      <object class="GtkMenuItem" id="PresentationMinimizerD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:ScriptOrganizer</property>
+        <property name="action_name">.uno:PresentationMinimizer</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MacroSignatureD">
+      <object class="GtkMenuItem" id="BmpMaskD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:MacroSignature</property>
+        <property name="action_name">.uno:BmpMask</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MacroOrganizerD">
+      <object class="GtkMenuItem" id="AVMediaPlayerD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:MacroOrganizer?TabId:short=1</property>
+        <property name="action_name">.uno:AVMediaPlayer</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator101">
+      <object class="GtkSeparatorMenuItem" id="separator69">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -2893,21 +2587,22 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="PackageManageManagerDialogD">
+      <object class="GtkMenuItem" id="PackageManagerDialogD">
         <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="ConfigureDialog">
+      <object class="GtkMenuItem" id="UpdateMenuD2">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:ConfigureDialog</property>
+        <property name="action_name">vnd.sun.star.job:alias=UpdateCheck</property>
+        <property name="label" context="notebookbar_groupedbar_full|Tools"  translatable="yes">~Check for Updates...</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="OptionsTreeDialog">
+      <object class="GtkMenuItem" id="OptionsTreeDialogD2">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:OptionsTreeDialog</property>
@@ -2946,6 +2641,12 @@
       </object>
     </child>
     <child>
+      <object class="GtkSeparatorMenuItem" id="separator17">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
       <object class="GtkMenuItem" id="SlideMasterPageD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -2967,16 +2668,23 @@
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator17">
+      <object class="GtkSeparatorMenuItem" id="separator41">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="AvailableToolbarsD">
+      <object class="GtkMenuItem" id="MenubarD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:AvailableToolbars</property>
+        <property name="action_name">.uno:Menubar</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="Sidebar">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:Sidebar</property>
       </object>
     </child>
     <child>
@@ -2987,6 +2695,12 @@
       </object>
     </child>
     <child>
+      <object class="GtkSeparatorMenuItem" id="separator46">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
       <object class="GtkMenuItem" id="LeftPaneImpressD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -3001,41 +2715,34 @@
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator41">
+      <object class="GtkMenuItem" id="ShowRulerD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:ShowRuler</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ShowGraphicsD">
+      <object class="GtkSeparatorMenuItem" id="separator53">
         <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">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:GridUse</property>
+        <property name="action_name">.uno:GridVisible</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="GridFrontD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:GridFront</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="HelplinesMoveD1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:HelplinesMove</property>
+        <property name="action_name">.uno:GridUse</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator46">
+      <object class="GtkSeparatorMenuItem" id="separator70">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -3055,14 +2762,7 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="HelplinesFrontD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:HelplinesFront</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="separator53">
+      <object class="GtkSeparatorMenuItem" id="separator74">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -3082,13 +2782,6 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="OutputQualityBlackWhiteD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:OutputQualityBlackWhite</property>
-      </object>
-    </child>
-    <child>
       <object class="GtkSeparatorMenuItem" id="separator158">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -3102,40 +2795,12 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ZoomPageWidthD">
-        <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="ZoomOptimalD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ZoomOptimal</property>
-      </object>
-    </child>
-    <child>
       <object class="GtkMenuItem" id="Zoom100PercentD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:Zoom100Percent</property>
       </object>
     </child>
-    <child>
-      <object class="GtkMenuItem" id="ZoomD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Zoom</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="ZoomPanningD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ZoomPanning</property>
-      </object>
-    </child>
   </object>
   <object class="GtkGrid" id="NotebookBar">
     <property name="visible">True</property>
@@ -3766,10 +3431,10 @@
                                     <property name="toolbar_style">both-horiz</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="Presentation2">
+                                      <object class="GtkToolButton" id="Presentation">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:PresentationCurrentSlide</property>
+                                        <property name="action_name">.uno:Presentation</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -3790,10 +3455,10 @@
                                     <property name="toolbar_style">both-horiz</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="Presentation">
+                                      <object class="GtkToolButton" id="PresentationCurrentSlide2">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:Presentation</property>
+                                        <property name="action_name">.uno:PresentationCurrentSlide</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -5255,10 +4920,10 @@
                                     <property name="toolbar_style">both-horiz</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="Presentation1">
+                                      <object class="GtkToolButton" id="Presentation3">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:PresentationCurrentSlide</property>
+                                        <property name="action_name">.uno:Presentation</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -5279,10 +4944,10 @@
                                     <property name="toolbar_style">both-horiz</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="Presentation3">
+                                      <object class="GtkToolButton" id="PresentationCurrentSlide3">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:Presentation</property>
+                                        <property name="action_name">.uno:PresentationCurrentSlide</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -6537,10 +6202,10 @@
                                     <property name="toolbar_style">both-horiz</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="Presentation4">
+                                      <object class="GtkToolButton" id="Presentation5">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:PresentationCurrentSlide</property>
+                                        <property name="action_name">.uno:Presentation</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -6561,10 +6226,10 @@
                                     <property name="toolbar_style">both-horiz</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="Presentation5">
+                                      <object class="GtkToolButton" id="PresentationCurrentSlide5">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:Presentation</property>
+                                        <property name="action_name">.uno:PresentationCurrentSlide</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -10774,10 +10439,10 @@
                                     <property name="toolbar_style">both-horiz</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="Presentation6">
+                                      <object class="GtkToolButton" id="Presentation7">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:PresentationCurrentSlide</property>
+                                        <property name="action_name">.uno:Presentation</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -10798,10 +10463,10 @@
                                     <property name="toolbar_style">both-horiz</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="Presentation7">
+                                      <object class="GtkToolButton" id="PresentationCurrentSlide7">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:Presentation</property>
+                                        <property name="action_name">.uno:PresentationCurrentSlide</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>