From 3316edf639424d8129f6288e1e736e2d095c5b25 Mon Sep 17 00:00:00 2001
From: andreas kainz <kainz.a@gmail.com>
Date: Wed, 16 May 2018 00:48:35 +0200
Subject: Change 53905 - Modified IDs for objects in writer "notebookbar.ui"

Change-Id: Id8b7367c5d29419c5889f652363269a5384b99f5
Reviewed-on: https://gerrit.libreoffice.org/54403
Reviewed-by: andreas_kainz <kainz.a@gmail.com>
Tested-by: andreas_kainz <kainz.a@gmail.com>
---
 sw/uiconfig/swriter/ui/notebookbar.ui | 818 +++++++++++++++++-----------------
 1 file changed, 400 insertions(+), 418 deletions(-)

(limited to 'sw')

diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui b/sw/uiconfig/swriter/ui/notebookbar.ui
index 5b8880917fe8..f564be8d229a 100644
--- a/sw/uiconfig/swriter/ui/notebookbar.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar.ui
@@ -1788,7 +1788,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">1</property>
                             <child>
-                              <object class="GtkToolButton" id="CloseDoc">
+                              <object class="GtkToolButton" id="File-CloseDoc">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:CloseDoc</property>
@@ -1815,7 +1815,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">1</property>
                             <child>
-                              <object class="GtkToolButton" id="HelpIndex">
+                              <object class="GtkToolButton" id="File-HelpIndex">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:HelpIndex</property>
@@ -1847,8 +1847,8 @@
                         <property name="vexpand">True</property>
                         <property name="orientation">vertical</property>
                         <child>
-                          <object class="svtlo-ManagedMenuButton" id="filetab:MenuFile">
-                            <property name="label" translatable="yes" context="notebookbar|fileb">_File</property>
+                          <object class="svtlo-ManagedMenuButton" id="File-FileButton:MenuFile">
+                            <property name="label" translatable="yes" context="notebookbar|FileMenuButton">_File</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -1866,8 +1866,8 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="svtlo-ManagedMenuButton" id="helpb:MenuHelp">
-                            <property name="label" translatable="yes" context="notebookbar|fileb">_Help</property>
+                          <object class="svtlo-ManagedMenuButton" id="File-HelpButton:MenuHelp">
+                            <property name="label" translatable="yes" context="notebookbar|HelpMenuButton">_Help</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -1939,7 +1939,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkMenuToolButton" id="New">
+                              <object class="GtkMenuToolButton" id="File-AddDirect">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:AddDirect</property>
@@ -1969,7 +1969,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="NewDoc">
+                                  <object class="GtkToolButton" id="File-NewDoc">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:NewDoc</property>
@@ -1994,7 +1994,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="SaveAsTemplate">
+                                  <object class="GtkToolButton" id="File-SaveAsTemplate">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:SaveAsTemplate</property>
@@ -2057,7 +2057,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="Open">
+                              <object class="GtkToolButton" id="File-Open">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:Open</property>
@@ -2082,8 +2082,7 @@
                             <property name="valign">center</property>
                             <property name="orientation">vertical</property>
                             <child>
-                              <object class="svtlo-ManagedMenuButton" id="RecentFilesB">
-                                <property name="use_action_appearance">False</property>
+                              <object class="svtlo-ManagedMenuButton" id="File-RecentFileList">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -2105,7 +2104,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="OpenRemote">
+                                  <object class="GtkToolButton" id="File-OpenRemote">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:OpenRemote</property>
@@ -2168,7 +2167,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="Save">
+                              <object class="GtkToolButton" id="File-Save">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:Save</property>
@@ -2199,7 +2198,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="SaveAs">
+                                  <object class="GtkToolButton" id="File-SaveAs">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:SaveAs</property>
@@ -2224,7 +2223,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="SaveAsRemote">
+                                  <object class="GtkToolButton" id="File-SaveAsRemote">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:SaveAsRemote</property>
@@ -2290,7 +2289,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="ExportTo1">
+                              <object class="GtkToolButton" id="File-ExportTo">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:ExportTo</property>
@@ -2321,7 +2320,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="ExportDirectToPDF">
+                                  <object class="GtkToolButton" id="File-ExportDirectToPDF">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ExportDirectToPDF</property>
@@ -2346,7 +2345,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="ExportDirectToEPUB">
+                                  <object class="GtkToolButton" id="File-ExportDirectToEPUB">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ExportDirectToEPUB</property>
@@ -2412,7 +2411,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="Print">
+                              <object class="GtkToolButton" id="File-Print">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:Print</property>
@@ -2443,7 +2442,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="PrintDefault">
+                                  <object class="GtkToolButton" id="File-PrintDefault">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:PrintDefault</property>
@@ -2468,7 +2467,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="PrintPreview">
+                                  <object class="GtkToolButton" id="File-PrintPreview">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:PrintPreview</property>
@@ -2534,7 +2533,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="SetDocumentProperties">
+                              <object class="GtkToolButton" id="File-SetDocumentProperties">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:SetDocumentProperties</property>
@@ -2565,7 +2564,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="Signature">
+                                  <object class="GtkToolButton" id="File-Signature">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Signature</property>
@@ -2590,7 +2589,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="SignPDF">
+                                  <object class="GtkToolButton" id="File-SignPDF">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:SignPDF</property>
@@ -2692,7 +2691,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkMenuToolButton" id="Paste">
+                              <object class="GtkMenuToolButton" id="Home-Paste">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:Paste</property>
@@ -2722,7 +2721,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="Cut">
+                                  <object class="GtkToolButton" id="Home-Cut">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Cut</property>
@@ -2746,7 +2745,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="Copy">
+                                  <object class="GtkToolButton" id="Home-Copy">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Copy</property>
@@ -2814,8 +2813,8 @@
                         <property name="vexpand">True</property>
                         <property name="orientation">vertical</property>
                         <child>
-                          <object class="svtlo-ManagedMenuButton" id="menut:MenuHome">
-                            <property name="label" translatable="yes" context="notebookbar|menub">_Home</property>
+                          <object class="svtlo-ManagedMenuButton" id="Home-HomeButton:MenuHome">
+                            <property name="label" translatable="yes" context="notebookbar|HomeMenuButton">_Home</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="receives_default">False</property>
@@ -2841,7 +2840,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">1</property>
                             <child>
-                              <object class="GtkToolButton" id="SearchDialog">
+                              <object class="GtkToolButton" id="Home-SearchDialog">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:SearchDialog</property>
@@ -2852,7 +2851,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkToolButton" id="Find">
+                              <object class="GtkToolButton" id="Home-FocusToFindbar">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="valign">center</property>
@@ -2910,7 +2909,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="FormatPaintbrush">
+                                  <object class="GtkToolButton" id="Home-FormatPaintbrush">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:FormatPaintbrush</property>
@@ -2934,7 +2933,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="ResetAttributes">
+                                  <object class="GtkToolButton" id="Home-ResetAttributes">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ResetAttributes</property>
@@ -2992,7 +2991,7 @@
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <child>
-                                          <object class="GtkToolButton" id="fontname">
+                                          <object class="GtkToolButton" id="Home-CarFontName">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="action_name">.uno:CharFontName</property>
@@ -3015,7 +3014,7 @@
                                         <property name="can_focus">False</property>
                                         <property name="margin_left">5</property>
                                         <child>
-                                          <object class="GtkToolButton" id="fontsize">
+                                          <object class="GtkToolButton" id="Home-FontHeight">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="action_name">.uno:FontHeight</property>
@@ -3051,7 +3050,7 @@
                                         <property name="toolbar_style">icons</property>
                                         <property name="show_arrow">False</property>
                                         <child>
-                                          <object class="GtkToolButton" id="Bold">
+                                          <object class="GtkToolButton" id="Home-Bold">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="action_name">.uno:Bold</property>
@@ -3062,7 +3061,7 @@
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkToolButton" id="Italic">
+                                          <object class="GtkToolButton" id="Home-Italic">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="action_name">.uno:Italic</property>
@@ -3073,7 +3072,7 @@
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkToolButton" id="Underline">
+                                          <object class="GtkToolButton" id="Home-UnderlineSimple">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="action_name">.uno:UnderlineSimple</property>
@@ -3084,7 +3083,7 @@
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkToolButton" id="Strikeout">
+                                          <object class="GtkToolButton" id="Home-Strikeout">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="action_name">.uno:Strikeout</property>
@@ -3125,7 +3124,7 @@
                                         <property name="toolbar_style">icons</property>
                                         <property name="show_arrow">False</property>
                                         <child>
-                                          <object class="GtkMenuToolButton" id="BackColor2">
+                                          <object class="GtkMenuToolButton" id="Home-BackColor">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="action_name">.uno:BackColor</property>
@@ -3136,7 +3135,7 @@
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkMenuToolButton" id="fontcolor2">
+                                          <object class="GtkMenuToolButton" id="Home-Color">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="action_name">.uno:Color</property>
@@ -3182,7 +3181,7 @@
                                     <property name="toolbar_style">icons</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="Grow">
+                                      <object class="GtkToolButton" id="Home-Grow">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:Grow</property>
@@ -3193,7 +3192,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToolButton" id="Shrink">
+                                      <object class="GtkToolButton" id="Home-Shrink">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:Shrink</property>
@@ -3219,7 +3218,7 @@
                                     <property name="toolbar_style">icons</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="SubScript">
+                                      <object class="GtkToolButton" id="Home-SubScript">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:SubScript</property>
@@ -3230,7 +3229,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToolButton" id="SuperScript">
+                                      <object class="GtkToolButton" id="Home-SuperScript">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:SuperScript</property>
@@ -3310,7 +3309,7 @@
                                     <property name="toolbar_style">icons</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="DefaultBullet">
+                                      <object class="GtkToolButton" id="Home-DefaultBullet">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:DefaultBullet</property>
@@ -3321,7 +3320,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToolButton" id="SetOutline">
+                                      <object class="GtkToolButton" id="Home-SetOutline">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:SetOutline</property>
@@ -3332,7 +3331,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToolButton" id="IncrementIndent1">
+                                      <object class="GtkToolButton" id="Home-IncrementIndent">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="halign">center</property>
@@ -3345,7 +3344,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToolButton" id="DecrementIndent1">
+                                      <object class="GtkToolButton" id="Home-DecrementIndent">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="halign">center</property>
@@ -3386,7 +3385,7 @@
                                     <property name="toolbar_style">icons</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="BackgroundColor">
+                                      <object class="GtkToolButton" id="Home-BackgroundColor">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="halign">center</property>
@@ -3399,7 +3398,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToolButton" id="ControlCodes4">
+                                      <object class="GtkToolButton" id="Home-ControlCodes">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:ControlCodes</property>
@@ -3448,7 +3447,7 @@
                                     <property name="toolbar_style">icons</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="LeftPara1">
+                                      <object class="GtkToolButton" id="Home-LeftPara">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="halign">center</property>
@@ -3461,7 +3460,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToolButton" id="CenterPara1">
+                                      <object class="GtkToolButton" id="Home-CenterPara">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="halign">center</property>
@@ -3474,7 +3473,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToolButton" id="RightPara2">
+                                      <object class="GtkToolButton" id="Home-RightPara">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="halign">center</property>
@@ -3487,7 +3486,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToolButton" id="JustifyPara2">
+                                      <object class="GtkToolButton" id="Home-JustifyPara">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="halign">center</property>
@@ -3528,7 +3527,7 @@
                                     <property name="toolbar_style">icons</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkMenuToolButton" id="LineSpacing1">
+                                      <object class="GtkMenuToolButton" id="Home-LineSpacing">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="halign">end</property>
@@ -3540,7 +3539,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToolButton" id="ParaspaceIncrease2">
+                                      <object class="GtkToolButton" id="Home-ParaspaceIncrease">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:ParaspaceIncrease</property>
@@ -3551,7 +3550,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToolButton" id="ParaspaceDecrease1">
+                                      <object class="GtkToolButton" id="Home-ParaspaceDecrease">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:ParaspaceDecrease</property>
@@ -3631,7 +3630,7 @@
                                     <property name="toolbar_style">icons</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="DesignerDialog">
+                                      <object class="GtkToolButton" id="Home-DesignerDialog">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="halign">center</property>
@@ -3657,7 +3656,7 @@
                                     <property name="toolbar_style">icons</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="StyleApply3">
+                                      <object class="GtkToolButton" id="Home-StyleApply">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="halign">center</property>
@@ -3683,7 +3682,7 @@
                                     <property name="toolbar_style">icons</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="StyleUpdateByExample">
+                                      <object class="GtkToolButton" id="Home-StyleUpdateByExample">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="halign">center</property>
@@ -3696,7 +3695,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToolButton" id="EditStyle1">
+                                      <object class="GtkToolButton" id="Home-EditStyle">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="halign">center</property>
@@ -3735,7 +3734,7 @@
                                     <property name="toolbar_style">icons</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="StandardStyle">
+                                      <object class="GtkToolButton" id="Home-StandardStyle">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:StyleApply?Style:string=Standard&amp;FamilyName:string=ParagraphStyles</property>
@@ -3777,7 +3776,7 @@
                                     <property name="toolbar_style">icons</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="H1">
+                                      <object class="GtkToolButton" id="Home-H1Style">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:StyleApply?Style:string=Heading 1&amp;FamilyName:string=ParagraphStyles</property>
@@ -3789,7 +3788,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToolButton" id="H2">
+                                      <object class="GtkToolButton" id="Home-H2Style">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:StyleApply?Style:string=Heading 2&amp;FamilyName:string=ParagraphStyles</property>
@@ -3801,7 +3800,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToolButton" id="H3">
+                                      <object class="GtkToolButton" id="Home-H3Style">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:StyleApply?Style:string=Heading 3&amp;FamilyName:string=ParagraphStyles</property>
@@ -3813,7 +3812,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToolButton" id="H4">
+                                      <object class="GtkToolButton" id="Home-H4Style">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:StyleApply?Style:string=Heading 4&amp;FamilyName:string=ParagraphStyles</property>
@@ -3855,7 +3854,7 @@
                                     <property name="toolbar_style">icons</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="EmphasisCharStyle">
+                                      <object class="GtkToolButton" id="Home-EmphasisCharStyle">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:StyleApply?Style:string=Emphasis&amp;FamilyName:string=CharacterStyles</property>
@@ -3867,7 +3866,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToolButton" id="StrongEmphasisCharStyle">
+                                      <object class="GtkToolButton" id="Home-StrongEmphasisCharStyle">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:StyleApply?Style:string=Strong Emphasis&amp;FamilyName:string=CharacterStyles</property>
@@ -3928,7 +3927,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-OptionalBox" id="InsertSection">
+                      <object class="sfxlo-OptionalBox" id="Home-InsertSection">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="valign">center</property>
@@ -3970,7 +3969,7 @@
                                 <property name="toolbar_style">icons</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="InsertGraphic">
+                                  <object class="GtkToolButton" id="Home-InsertGraphic">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="valign">center</property>
@@ -3982,7 +3981,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="InsertPagebreak1">
+                                  <object class="GtkToolButton" id="Home-InsertPagebreak">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="valign">center</property>
@@ -3994,7 +3993,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="InsertSymbol">
+                                  <object class="GtkToolButton" id="Home-InsertSymbol">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="valign">center</property>
@@ -4063,7 +4062,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="Zoom2">
+                                  <object class="GtkToolButton" id="Home-Zoom">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Zoom</property>
@@ -4087,7 +4086,7 @@
                                 <property name="toolbar_style">icons</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="InsertAnnotation2">
+                                  <object class="GtkToolButton" id="Home-InsertAnnotation">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:InsertAnnotation</property>
@@ -4098,7 +4097,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="PrintPreview1">
+                                  <object class="GtkToolButton" id="Home-PrintPreview">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:PrintPreview</property>
@@ -4109,7 +4108,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="Navigator1">
+                                  <object class="GtkToolButton" id="Home-Navigator">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="valign">center</property>
@@ -4242,7 +4241,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="InsertPagebreak">
+                              <object class="GtkToolButton" id="Insert-InsertPagebreak">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:InsertPagebreak</property>
@@ -4272,7 +4271,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="TitlePageDialog">
+                                  <object class="GtkToolButton" id="Insert-TitlePageDialog">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:TitlePageDialog</property>
@@ -4296,7 +4295,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="InsertSection2">
+                                  <object class="GtkToolButton" id="Insert-InsertSection">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:InsertSection</property>
@@ -4358,7 +4357,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="InserTable">
+                              <object class="GtkToolButton" id="Insert-InserTable">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:InsertTable</property>
@@ -4388,7 +4387,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="InsertObjectChart">
+                                  <object class="GtkToolButton" id="Insert-InsertObjectChart">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:InsertObjectChart</property>
@@ -4412,7 +4411,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="InsertObject">
+                                  <object class="GtkToolButton" id="Insert-InsertObject">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:InsertObject</property>
@@ -4474,7 +4473,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="InsertGraphic1">
+                              <object class="GtkToolButton" id="Insert-InsertGraphic">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:InsertGraphic</property>
@@ -4504,7 +4503,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="Gallery">
+                                  <object class="GtkToolButton" id="Insert-Gallery">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Gallery</property>
@@ -4528,7 +4527,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="InsertAVMedia">
+                                  <object class="GtkToolButton" id="Insert-InsertAVMedia">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:InsertAVMedia</property>
@@ -4590,7 +4589,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="HyperlinkDialog">
+                              <object class="GtkToolButton" id="Insert-HyperlinkDialog">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:HyperlinkDialog</property>
@@ -4620,7 +4619,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="InsertBookmark1">
+                                  <object class="GtkToolButton" id="Insert-InsertBookmark">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:InsertBookmark</property>
@@ -4644,7 +4643,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="InsertReferenceField1">
+                                  <object class="GtkToolButton" id="Insert-InsertReferenceField">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:InsertReferenceField</property>
@@ -4709,7 +4708,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkMenuToolButton" id="InsertFieldCtrl2">
+                              <object class="GtkMenuToolButton" id="Insert-InsertFieldCtrl">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:InsertFieldCtrl</property>
@@ -4767,7 +4766,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="DrawText4">
+                              <object class="GtkToolButton" id="Insert-DrawText">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:DrawText</property>
@@ -4797,7 +4796,7 @@
                                 <property name="toolbar_style">icons</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="Line2">
+                                  <object class="GtkToolButton" id="Insert-Line">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Line</property>
@@ -4808,7 +4807,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="Polygon_Unfilled2">
+                                  <object class="GtkToolButton" id="Insert-Polygon_Unfilled">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Polygon_Unfilled</property>
@@ -4819,7 +4818,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="Bezier_Unfilled1">
+                                  <object class="GtkToolButton" id="Insert-Bezier_Unfilled">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Bezier_Unfilled</property>
@@ -4830,7 +4829,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="ArrowsToolbox1">
+                                  <object class="GtkToolButton" id="Insert-ArrowsToolbox">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ArrowsToolbox</property>
@@ -4854,7 +4853,7 @@
                                 <property name="toolbar_style">icons</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="rectangle2">
+                                  <object class="GtkToolButton" id="Insert-BasicShapes.rectangle">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:BasicShapes.rectangle</property>
@@ -4865,7 +4864,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="BasicShapes.round-rectangle1">
+                                  <object class="GtkToolButton" id="Insert-BasicShapes.round-rectangle">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:BasicShapes.round-rectangle</property>
@@ -4876,7 +4875,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="ellipse2">
+                                  <object class="GtkToolButton" id="Insert-BasicShapes.ellipse">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:BasicShapes.ellipse</property>
@@ -4887,7 +4886,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="LineToolbox1">
+                                  <object class="GtkToolButton" id="Insert-LineToolbox">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:LineToolbox</property>
@@ -4953,7 +4952,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="BasicShapes3">
+                                  <object class="GtkToolButton" id="Insert-BasicShapes">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:BasicShapes</property>
@@ -4964,7 +4963,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="SymbolShapes3">
+                                  <object class="GtkToolButton" id="Insert-SymbolShapes">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:SymbolShapes</property>
@@ -4975,7 +4974,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="ArrowShapes3">
+                                  <object class="GtkToolButton" id="Insert-ArrowShapes">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ArrowShapes</property>
@@ -4997,7 +4996,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="StarShapes3">
+                                  <object class="GtkToolButton" id="Insert-StarShapes">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:StarShapes</property>
@@ -5008,7 +5007,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="CalloutShapes3">
+                                  <object class="GtkToolButton" id="Insert-CalloutShapes">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:CalloutShapes</property>
@@ -5019,7 +5018,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="FlowChartShapes2">
+                                  <object class="GtkToolButton" id="Insert-FlowChartShapes">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:FlowChartShapes</property>
@@ -5084,7 +5083,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="EditGlossary1">
+                              <object class="GtkToolButton" id="Insert-EditGlossary">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:EditGlossary</property>
@@ -5142,7 +5141,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="InsertGraphic2">
+                              <object class="GtkToolButton" id="InsertGraphic">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:InsertSymbol</property>
@@ -5172,7 +5171,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="InsertObjectStarMath1">
+                                  <object class="GtkToolButton" id="Insert-InsertObjectStarMath">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:InsertObjectStarMath</property>
@@ -5196,7 +5195,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="EmojiControl2">
+                                  <object class="GtkToolButton" id="Insert-EmojiControl">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:EmojiControl</property>
@@ -5270,8 +5269,8 @@
                         <property name="vexpand">True</property>
                         <property name="orientation">vertical</property>
                         <child>
-                          <object class="svtlo-ManagedMenuButton" id="insertb:MenuInsert">
-                            <property name="label" translatable="yes" context="notebookbar|menub">_Insert</property>
+                          <object class="svtlo-ManagedMenuButton" id="Insert-InsertButton:MenuInsert">
+                            <property name="label" translatable="yes" context="notebookbar|InsertMenuButton">_Insert</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="receives_default">False</property>
@@ -5297,7 +5296,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">1</property>
                             <child>
-                              <object class="GtkToolButton" id="InsertDraw">
+                              <object class="GtkToolButton" id="Insert-InsertDraw">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="valign">center</property>
@@ -5385,8 +5384,8 @@
                         <property name="vexpand">True</property>
                         <property name="orientation">vertical</property>
                         <child>
-                          <object class="svtlo-ManagedMenuButton" id="reviewb:MenuPage">
-                            <property name="label" translatable="yes" context="notebookbar|reviewb">Pag_e</property>
+                          <object class="svtlo-ManagedMenuButton" id="Layout-PageButton:MenuPage">
+                            <property name="label" translatable="yes" context="notebookbar|PageMenuButton">Pag_e</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="receives_default">False</property>
@@ -5412,7 +5411,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">1</property>
                             <child>
-                              <object class="GtkToolButton" id="PageDialog">
+                              <object class="GtkToolButton" id="Layout-PageDialog">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="valign">center</property>
@@ -5483,7 +5482,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkMenuToolButton" id="Margin">
+                              <object class="GtkMenuToolButton" id="Layout-Margin">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:PageMargin</property>
@@ -5494,7 +5493,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkMenuToolButton" id="Orientation">
+                              <object class="GtkMenuToolButton" id="Layout-Orientation">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:Orientation</property>
@@ -5505,7 +5504,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkMenuToolButton" id="Size">
+                              <object class="GtkMenuToolButton" id="Layout-Size">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:AttributePageSize</property>
@@ -5516,8 +5515,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkMenuToolButton" id="Columns">
-                                <property name="use_action_appearance">False</property>
+                              <object class="GtkMenuToolButton" id="Layout-Columns">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:PageColumnType</property>
@@ -5547,7 +5545,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="InsertPagebreak2">
+                                  <object class="GtkToolButton" id="Layout-InsertPagebreak">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:InsertPagebreak</property>
@@ -5571,7 +5569,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="InsertBreak2">
+                                  <object class="GtkToolButton" id="Layout-InsertBreak">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="halign">start</property>
@@ -5639,7 +5637,7 @@
                                 <property name="vexpand">True</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="LeftParaMargin">
+                                  <object class="GtkToolButton" id="Layout-LeftParaMargin">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="valign">center</property>
@@ -5666,7 +5664,7 @@
                                 <property name="vexpand">True</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="RightParaMargin1">
+                                  <object class="GtkToolButton" id="Layout-RightParaMargin">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="valign">center</property>
@@ -5707,7 +5705,7 @@
                                 <property name="vexpand">True</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="AboveSpacing">
+                                  <object class="GtkToolButton" id="Layout-AboveSpacing">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="valign">center</property>
@@ -5733,7 +5731,7 @@
                                 <property name="valign">center</property>
                                 <property name="vexpand">True</property>
                                 <child>
-                                  <object class="GtkToolButton" id="BelowSpacing4">
+                                  <object class="GtkToolButton" id="Layout-BelowSpacing">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="valign">center</property>
@@ -5803,7 +5801,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="TitlePageDialog3">
+                                  <object class="GtkToolButton" id="Layout-TitlePageDialog">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:TitlePageDialog</property>
@@ -5827,7 +5825,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="Watermark1">
+                                  <object class="GtkToolButton" id="Layout-Watermark">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Watermark</property>
@@ -5866,7 +5864,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="Hyphenate">
+                                  <object class="GtkToolButton" id="Layout-Hyphenate">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Hyphenate</property>
@@ -5892,7 +5890,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="LineNumberingDialog2">
+                                  <object class="GtkToolButton" id="Layout-LineNumberingDialog">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="halign">start</property>
@@ -5961,7 +5959,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="SelectObject2">
+                                  <object class="GtkToolButton" id="Layout-SelectObject">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:SelectObject</property>
@@ -5985,7 +5983,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="FormatGroup2">
+                                  <object class="GtkToolButton" id="Layout-FormatGroup">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:FormatGroup</property>
@@ -6053,7 +6051,7 @@
                                 <property name="toolbar_style">icons</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="WrapOff3">
+                                  <object class="GtkToolButton" id="Layout-WrapOff">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:WrapOff</property>
@@ -6064,7 +6062,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="WrapOn3">
+                                  <object class="GtkToolButton" id="Layout-WrapOn">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:WrapOn</property>
@@ -6075,7 +6073,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="WrapIdeal3">
+                                  <object class="GtkToolButton" id="Layout-WrapIdeal">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:WrapIdeal</property>
@@ -6099,7 +6097,7 @@
                                 <property name="toolbar_style">icons</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="WrapLeft3">
+                                  <object class="GtkToolButton" id="Layout-WrapLeft">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:WrapLeft</property>
@@ -6110,7 +6108,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="WrapThrough3">
+                                  <object class="GtkToolButton" id="Layout-WrapThrough">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:WrapThrough</property>
@@ -6121,7 +6119,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="WrapRight3">
+                                  <object class="GtkToolButton" id="Layout-WrapRight">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:WrapRight</property>
@@ -6189,7 +6187,7 @@
                                 <property name="toolbar_style">icons</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="AlignBottom5">
+                                  <object class="GtkToolButton" id="Layout-AlignBottom">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ObjectForwardOne</property>
@@ -6200,7 +6198,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="BringToFront4">
+                                  <object class="GtkToolButton" id="Layout-BringToFront">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:BringToFront</property>
@@ -6224,7 +6222,7 @@
                                 <property name="toolbar_style">icons</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="ObjectBackOne3">
+                                  <object class="GtkToolButton" id="Layout-ObjectBackOne">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ObjectBackOne</property>
@@ -6235,7 +6233,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="SendToBack3">
+                                  <object class="GtkToolButton" id="Layout-SendToBack">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:SendToBack</property>
@@ -6333,8 +6331,8 @@
                         <property name="vexpand">True</property>
                         <property name="orientation">vertical</property>
                         <child>
-                          <object class="svtlo-ManagedMenuButton" id="referenceb:MenuReference">
-                            <property name="label" translatable="yes" context="notebookbar|referenceb">Reference_s</property>
+                          <object class="svtlo-ManagedMenuButton" id="References-ReferencesButton:MenuReference">
+                            <property name="label" translatable="yes" context="notebookbar|ReferencesMenuButton">Reference_s</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="receives_default">False</property>
@@ -6359,7 +6357,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">1</property>
                             <child>
-                              <object class="GtkToolButton" id="UpdateAll">
+                              <object class="GtkToolButton" id="References-UpdateAll">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="valign">center</property>
@@ -6432,7 +6430,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="InsertMultiIndex">
+                              <object class="GtkToolButton" id="References-InsertMultiIndex">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:InsertMultiIndex</property>
@@ -6463,7 +6461,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="InsertIndexesEntry">
+                                  <object class="GtkToolButton" id="References-InsertIndexesEntry">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:InsertIndexesEntry</property>
@@ -6487,7 +6485,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="UpdateAllIndexes">
+                                  <object class="GtkToolButton" id="References-UpdateAllIndexes">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:UpdateCurIndex</property>
@@ -6549,7 +6547,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="InsertFootnote">
+                              <object class="GtkToolButton" id="References-InsertFootnote">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:InsertFootnote</property>
@@ -6582,7 +6580,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="InsertEndnote">
+                                  <object class="GtkToolButton" id="References-InsertEndnote">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:InsertEndnote</property>
@@ -6608,7 +6606,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="FootnoteDialog">
+                                  <object class="GtkToolButton" id="References-FootnoteDialog">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:FootnoteDialog</property>
@@ -6670,7 +6668,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="InsertReferenceField2">
+                              <object class="GtkToolButton" id="References-InsertReferenceField">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:InsertReferenceField</property>
@@ -6701,7 +6699,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="InsertBookmark">
+                                  <object class="GtkToolButton" id="References-InsertBookmark">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:InsertBookmark</property>
@@ -6725,7 +6723,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="InsertCaptionDialog">
+                                  <object class="GtkToolButton" id="References-InsertCaptionDialog">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:InsertCaptionDialog</property>
@@ -6790,7 +6788,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="InsertAuthoritiesEntry">
+                              <object class="GtkToolButton" id="References-InsertAuthoritiesEntry">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:InsertAuthoritiesEntry</property>
@@ -6821,7 +6819,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="BibliographyComponent">
+                                  <object class="GtkToolButton" id="References-BibliographyComponent">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:BibliographyComponent</property>
@@ -6845,7 +6843,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="ViewDataSourceBrowser">
+                                  <object class="GtkToolButton" id="References-ViewDataSourceBrowser">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ViewDataSourceBrowser</property>
@@ -6948,7 +6946,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="SpellingAndGrammarDialog2">
+                              <object class="GtkToolButton" id="Review-SpellingAndGrammarDialog">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:SpellingAndGrammarDialog</property>
@@ -6959,7 +6957,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkToolButton" id="ThesaurusDialog3">
+                              <object class="GtkToolButton" id="Review-ThesaurusDialog">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:ThesaurusDialog</property>
@@ -6990,7 +6988,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="SpellOnline1">
+                                  <object class="GtkToolButton" id="Review-SpellOnline">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:SpellOnline</property>
@@ -7014,7 +7012,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="WordCountDialog">
+                                  <object class="GtkToolButton" id="Review-WordCountDialog">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:WordCountDialog</property>
@@ -7076,7 +7074,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="InsertAnnotation1">
+                              <object class="GtkToolButton" id="Review-InsertAnnotation">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:InsertAnnotation</property>
@@ -7109,7 +7107,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="ReplyComment">
+                                  <object class="GtkToolButton" id="Review-ReplyComment">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ReplyComment</property>
@@ -7135,7 +7133,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="DeleteComment">
+                                  <object class="GtkToolButton" id="Review-DeleteComment">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:DeleteComment</property>
@@ -7200,7 +7198,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="TrackChanges1">
+                              <object class="GtkToolButton" id="Review-TrackChanges">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:TrackChanges</property>
@@ -7211,7 +7209,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkToolButton" id="ShowTrackedChanges1">
+                              <object class="GtkToolButton" id="Review-ShowTrackedChanges">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:ShowTrackedChanges</property>
@@ -7242,7 +7240,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="NextTrackedChange1">
+                                  <object class="GtkToolButton" id="Review-NextTrackedChange">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:NextTrackedChange</property>
@@ -7266,7 +7264,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="PreviousTrackedChange1">
+                                  <object class="GtkToolButton" id="Review-PreviousTrackedChange">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:PreviousTrackedChange</property>
@@ -7304,7 +7302,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="AcceptTrackedChange1">
+                                  <object class="GtkToolButton" id="Review-AcceptTrackedChange">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:AcceptTrackedChange</property>
@@ -7328,7 +7326,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="RejectTrackedChange1">
+                                  <object class="GtkToolButton" id="Review-RejectTrackedChange">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:RejectTrackedChange</property>
@@ -7366,7 +7364,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="AcceptAllTrackedChanges">
+                                  <object class="GtkToolButton" id="Review-AcceptAllTrackedChanges">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:AcceptAllTrackedChanges</property>
@@ -7390,7 +7388,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="RejectAllTrackedChanges">
+                                  <object class="GtkToolButton" id="Review-RejectAllTrackedChanges">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:RejectAllTrackedChanges</property>
@@ -7455,7 +7453,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="ProtectTraceChangeMode">
+                              <object class="GtkToolButton" id="Review-ProtectTraceChangeMode">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:ProtectTraceChangeMode</property>
@@ -7486,7 +7484,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="CompareDocuments1">
+                                  <object class="GtkToolButton" id="Review-CompareDocuments">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:CompareDocuments</property>
@@ -7510,7 +7508,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="MergeDocuments1">
+                                  <object class="GtkToolButton" id="Review-MergeDocuments">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:MergeDocuments</property>
@@ -7570,7 +7568,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="sfxlo-DropdownBox" id="ReferenceMenue">
+                  <object class="sfxlo-DropdownBox" id="ReviewMenue">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">end</property>
@@ -7584,8 +7582,8 @@
                         <property name="vexpand">True</property>
                         <property name="orientation">vertical</property>
                         <child>
-                          <object class="svtlo-ManagedMenuButton" id="reviewR:MenuReview">
-                            <property name="label" translatable="yes" context="notebookbar|reviewR">_Review</property>
+                          <object class="svtlo-ManagedMenuButton" id="Review-ReviewButton:MenuReview">
+                            <property name="label" translatable="yes" context="notebookbar|ReviewMenuButton">_Review</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="receives_default">False</property>
@@ -7611,7 +7609,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">1</property>
                             <child>
-                              <object class="GtkToolButton" id="AcceptTrackedChanges1">
+                              <object class="GtkToolButton" id="Review-AcceptTrackedChanges">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="valign">center</property>
@@ -7705,7 +7703,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="PrintLayout1">
+                              <object class="GtkToolButton" id="View-PrintLayout">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:PrintLayout</property>
@@ -7716,7 +7714,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkToolButton" id="BrowseView1">
+                              <object class="GtkToolButton" id="View-BrowseView">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:BrowseView</property>
@@ -7727,7 +7725,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkToolButton" id="PrintPreview2">
+                              <object class="GtkToolButton" id="View-PrintPreview">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:PrintPreview</property>
@@ -7758,7 +7756,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="ControlCodes1">
+                                  <object class="GtkToolButton" id="View-ControlCodes">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ControlCodes</property>
@@ -7782,7 +7780,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="HideWhitespace2">
+                                  <object class="GtkToolButton" id="View-HideWhitespace">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:HideWhitespace</property>
@@ -7844,7 +7842,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="ZoomOptimal1">
+                              <object class="GtkToolButton" id="View-ZoomOptimal">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:ZoomOptimal</property>
@@ -7875,7 +7873,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="Zoom100Percent">
+                                  <object class="GtkToolButton" id="View-Zoom100Percent">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Zoom100Percent</property>
@@ -7899,7 +7897,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="ZoomPage">
+                                  <object class="GtkToolButton" id="View-ZoomPage">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ZoomPage</property>
@@ -7937,7 +7935,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="FullScreen1">
+                                  <object class="GtkToolButton" id="View-FullScreen">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:FullScreen</property>
@@ -7961,7 +7959,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="ZoomPageWidth">
+                                  <object class="GtkToolButton" id="View-ZoomPageWidth">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ZoomPageWidth</property>
@@ -8026,7 +8024,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="Sidebar2">
+                              <object class="GtkToolButton" id="View-Sidebar">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:Sidebar</property>
@@ -8059,7 +8057,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="Ruler2">
+                                  <object class="GtkToolButton" id="View-Ruler">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Ruler</property>
@@ -8085,7 +8083,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="GridVisible2">
+                                  <object class="GtkToolButton" id="View-GridVisible">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:GridVisible</property>
@@ -8125,7 +8123,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="Menubar">
+                                  <object class="GtkToolButton" id="View-Menubar">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Menubar</property>
@@ -8151,7 +8149,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="Navigator">
+                                  <object class="GtkToolButton" id="View-Navigator">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Navigator</property>
@@ -8216,7 +8214,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="NewWindow">
+                              <object class="GtkToolButton" id="View-NewWindow">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:NewWindow</property>
@@ -8283,8 +8281,8 @@
                         <property name="vexpand">True</property>
                         <property name="orientation">vertical</property>
                         <child>
-                          <object class="svtlo-ManagedMenuButton" id="viewb:MenuView">
-                            <property name="label" translatable="yes" context="notebookbar|viewb">_View</property>
+                          <object class="svtlo-ManagedMenuButton" id="View-ViewButton:MenuView">
+                            <property name="label" translatable="yes" context="notebookbar|ViewMenuButton">_View</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="receives_default">False</property>
@@ -8310,7 +8308,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">1</property>
                             <child>
-                              <object class="GtkToolButton" id="Zoom">
+                              <object class="GtkToolButton" id="View-Zoom">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="valign">center</property>
@@ -8404,7 +8402,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="InsertCaptionDialog1">
+                              <object class="GtkToolButton" id="Table-InsertCaptionDialog">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="valign">center</property>
@@ -8436,7 +8434,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="AutoFormat">
+                                  <object class="GtkToolButton" id="Table-AutoFormat">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="valign">center</property>
@@ -8461,8 +8459,7 @@
                                 <property name="toolbar_style">icons</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkMenuToolButton" id="SetBorderStyle1">
-                                    <property name="use_action_appearance">False</property>
+                                  <object class="GtkMenuToolButton" id="Table-SetBorderStyle">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:SetBorderStyle</property>
@@ -8473,7 +8470,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkMenuToolButton" id="LineStyle2">
+                                  <object class="GtkMenuToolButton" id="Table-LineStyle">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:LineStyle</property>
@@ -8484,8 +8481,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkMenuToolButton" id="FrameLineColor1">
-                                    <property name="use_action_appearance">False</property>
+                                  <object class="GtkMenuToolButton" id="Table-FrameLineColor">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:FrameLineColor</property>
@@ -8496,7 +8492,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkMenuToolButton" id="BackgroundColor2">
+                                  <object class="GtkMenuToolButton" id="Table-BackgroundColor">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:BackgroundColor</property>
@@ -8558,7 +8554,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="MergeCells">
+                              <object class="GtkToolButton" id="Table-MergeCells">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="valign">center</property>
@@ -8590,7 +8586,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="SplitCell">
+                                  <object class="GtkToolButton" id="Table-SplitCell">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:SplitCell</property>
@@ -8614,7 +8610,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="SplitTable">
+                                  <object class="GtkToolButton" id="Table-SplitTable">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:SplitTable</property>
@@ -8679,7 +8675,7 @@
                                 <property name="toolbar_style">icons</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="InsertColumnsBefore">
+                                  <object class="GtkToolButton" id="Table-InsertColumnsBefore">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:InsertColumnsBefore</property>
@@ -8690,7 +8686,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="InsertColumnsAfter">
+                                  <object class="GtkToolButton" id="Table-InsertColumnsAfter">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:InsertColumnsAfter</property>
@@ -8701,7 +8697,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="DeleteColumns">
+                                  <object class="GtkToolButton" id="Table-DeleteColumns">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:DeleteColumns</property>
@@ -8725,7 +8721,7 @@
                                 <property name="toolbar_style">icons</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="InsertRowsBefore">
+                                  <object class="GtkToolButton" id="Table-InsertRowsBefore">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:InsertRowsBefore</property>
@@ -8736,7 +8732,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="InsertRowsAfter">
+                                  <object class="GtkToolButton" id="Table-InsertRowsAfter">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:InsertRowsAfter</property>
@@ -8747,7 +8743,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="DeleteRows">
+                                  <object class="GtkToolButton" id="Table-DeleteRows">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:DeleteRows</property>
@@ -8812,7 +8808,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="EntireCell">
+                              <object class="GtkToolButton" id="Table-EntireCell">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:EntireCell</property>
@@ -8842,7 +8838,7 @@
                                 <property name="toolbar_style">icons</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="EntireColumn1">
+                                  <object class="GtkToolButton" id="Table-EntireColumn">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:EntireColumn</property>
@@ -8866,7 +8862,7 @@
                                 <property name="toolbar_style">icons</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="EntireRow1">
+                                  <object class="GtkToolButton" id="Table-EntireRow">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:EntireRow</property>
@@ -8903,7 +8899,7 @@
                                 <property name="toolbar_style">icons</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="SelectTable2">
+                                  <object class="GtkToolButton" id="Table-SelectTable">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:SelectTable</property>
@@ -8927,7 +8923,7 @@
                                 <property name="toolbar_style">icons</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="DeleteTable">
+                                  <object class="GtkToolButton" id="Table-DeleteTable">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:DeleteTable</property>
@@ -8992,7 +8988,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkMenuToolButton" id="OptimizeTable">
+                              <object class="GtkMenuToolButton" id="Table-OptimizeTable">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:OptimizeTable</property>
@@ -9022,7 +9018,7 @@
                                 <property name="toolbar_style">icons</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="CellVertTop">
+                                  <object class="GtkToolButton" id="Table-CellVertTop">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="halign">center</property>
@@ -9035,7 +9031,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="CellVertCenter">
+                                  <object class="GtkToolButton" id="Table-CellVertCenter">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="halign">center</property>
@@ -9048,7 +9044,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="CellVertBottom">
+                                  <object class="GtkToolButton" id="Table-CellVertBottom">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="halign">center</property>
@@ -9074,7 +9070,7 @@
                                 <property name="toolbar_style">icons</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="LeftPara2">
+                                  <object class="GtkToolButton" id="Table-LeftPara">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="halign">center</property>
@@ -9087,7 +9083,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="CenterPara2">
+                                  <object class="GtkToolButton" id="Table-CenterPara">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="halign">center</property>
@@ -9100,7 +9096,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="RightPara1">
+                                  <object class="GtkToolButton" id="Table-RightPara">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="halign">center</property>
@@ -9113,7 +9109,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="JustifyPara1">
+                                  <object class="GtkToolButton" id="Table-JustifyPara">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="halign">center</property>
@@ -9180,7 +9176,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="TableSort">
+                              <object class="GtkToolButton" id="Table-TableSort">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="valign">center</property>
@@ -9212,7 +9208,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="InsertFormula">
+                                  <object class="GtkToolButton" id="Table-InsertFormula">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:InsertFormula</property>
@@ -9236,7 +9232,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="AutoSum">
+                                  <object class="GtkToolButton" id="Table-AutoSum">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:AutoSum</property>
@@ -9301,7 +9297,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="TableNumberFormatDialog">
+                              <object class="GtkToolButton" id="Table-TableNumberFormatDialog">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:TableNumberFormatDialog</property>
@@ -9331,7 +9327,7 @@
                                 <property name="toolbar_style">icons</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="NumberFormatCurrency">
+                                  <object class="GtkToolButton" id="Table-NumberFormatCurrency">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:NumberFormatCurrency</property>
@@ -9342,7 +9338,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="NumberFormatDecimal">
+                                  <object class="GtkToolButton" id="Table-NumberFormatDecimal">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:NumberFormatDecimal</property>
@@ -9366,7 +9362,7 @@
                                 <property name="toolbar_style">icons</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="NumberFormatPercent">
+                                  <object class="GtkToolButton" id="Table-NumberFormatPercent">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:NumberFormatPercent</property>
@@ -9377,7 +9373,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="NumberFormatDate">
+                                  <object class="GtkToolButton" id="Table-NumberFormatDate">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:NumberFormatDate</property>
@@ -9451,8 +9447,8 @@
                         <property name="vexpand">True</property>
                         <property name="orientation">vertical</property>
                         <child>
-                          <object class="svtlo-ManagedMenuButton" id="tableT:MenuTable">
-                            <property name="label" translatable="yes" context="notebookbar|tableT">T_able</property>
+                          <object class="svtlo-ManagedMenuButton" id="Table-TableButton:MenuTable">
+                            <property name="label" translatable="yes" context="notebookbar|TableMenuButton">T_able</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="receives_default">False</property>
@@ -9477,7 +9473,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">1</property>
                             <child>
-                              <object class="GtkToolButton" id="TableDialog">
+                              <object class="GtkToolButton" id="Table-TableDialog">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="valign">center</property>
@@ -9574,7 +9570,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="InsertCaptionDialog4">
+                              <object class="GtkToolButton" id="Image-InsertCaptionDialog">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="valign">center</property>
@@ -9606,7 +9602,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="Crop">
+                                  <object class="GtkToolButton" id="Image-Crop">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Crop</property>
@@ -9630,7 +9626,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="SaveGraphic">
+                                  <object class="GtkToolButton" id="Image-SaveGraphic">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:SaveGraphic</property>
@@ -9667,7 +9663,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="CompressGraphic1">
+                                  <object class="GtkToolButton" id="Image-CompressGraphic">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:CompressGraphic</property>
@@ -9691,7 +9687,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="ChangePicture1">
+                                  <object class="GtkToolButton" id="Image-ChangePicture">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ChangePicture</property>
@@ -9728,7 +9724,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="RotateRight3">
+                                  <object class="GtkToolButton" id="Image-RotateRight">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:RotateRight</property>
@@ -9752,7 +9748,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="FlipHorizontal4">
+                                  <object class="GtkToolButton" id="Image-FlipHorizontal">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:FlipHorizontal</property>
@@ -9817,7 +9813,7 @@
                                 <property name="toolbar_style">icons</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="GrafMode1">
+                                  <object class="GtkToolButton" id="Image-GrafMode">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:GrafMode</property>
@@ -9846,8 +9842,7 @@
                                     <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>
+                                      <object class="GtkMenuToolButton" id="Image-GraphicFilterToolbox">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:GraphicFilterToolbox</property>
@@ -9871,8 +9866,7 @@
                                     <property name="toolbar_style">icons</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkMenuToolButton" id="SetBorderStyle2">
-                                        <property name="use_action_appearance">False</property>
+                                      <object class="GtkMenuToolButton" id="Image-SetBorderStyle">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:SetBorderStyle</property>
@@ -9883,8 +9877,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkMenuToolButton" id="BackgroundColor1">
-                                        <property name="use_action_appearance">False</property>
+                                      <object class="GtkMenuToolButton" id="Image-BackgroundColor">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:BackgroundColor</property>
@@ -9959,8 +9952,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkMenuToolButton" id="GrafLuminance2">
-                                    <property name="use_action_appearance">False</property>
+                                  <object class="GtkMenuToolButton" id="Image-GrafLuminance">
                                     <property name="width_request">130</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
@@ -9987,8 +9979,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkMenuToolButton" id="GrafTransparence1">
-                                    <property name="use_action_appearance">False</property>
+                                  <object class="GtkMenuToolButton" id="Image-GrafTransparence">
                                     <property name="width_request">130</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
@@ -10044,8 +10035,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkMenuToolButton" id="GrafContrast3">
-                                    <property name="use_action_appearance">False</property>
+                                  <object class="GtkMenuToolButton" id="Image-GrafContrast">
                                     <property name="width_request">130</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
@@ -10071,8 +10061,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkMenuToolButton" id="GrafGamma3">
-                                    <property name="use_action_appearance">False</property>
+                                  <object class="GtkMenuToolButton" id="Image-GrafGamma">
                                     <property name="width_request">130</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
@@ -10139,8 +10128,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkMenuToolButton" id="AnchorMenu1">
-                                <property name="use_action_appearance">False</property>
+                              <object class="GtkMenuToolButton" id="Image-AnchorMenu">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="valign">center</property>
@@ -10175,7 +10163,7 @@
                                     <property name="toolbar_style">icons</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="WrapOff">
+                                      <object class="GtkToolButton" id="Image-WrapOff">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:WrapOff</property>
@@ -10186,7 +10174,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToolButton" id="WrapOn">
+                                      <object class="GtkToolButton" id="Image-WrapOn">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:WrapOn</property>
@@ -10197,7 +10185,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToolButton" id="WrapIdeal">
+                                      <object class="GtkToolButton" id="Image-WrapIdeal">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:WrapIdeal</property>
@@ -10221,7 +10209,7 @@
                                     <property name="toolbar_style">icons</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="WrapLeft">
+                                      <object class="GtkToolButton" id="Image-WrapLeft">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:WrapLeft</property>
@@ -10232,7 +10220,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToolButton" id="WrapThrough">
+                                      <object class="GtkToolButton" id="Image-WrapThrough">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:WrapThrough</property>
@@ -10243,7 +10231,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToolButton" id="WrapRight">
+                                      <object class="GtkToolButton" id="Image-WrapRight">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:WrapRight</property>
@@ -10321,7 +10309,7 @@
                                     <property name="toolbar_style">icons</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="AlignLeft1">
+                                      <object class="GtkToolButton" id="Image-AlignLeft">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:AlignLeft</property>
@@ -10332,7 +10320,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToolButton" id="AlignHorizontalCenter1">
+                                      <object class="GtkToolButton" id="Image-AlignHorizontalCenter">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:AlignHorizontalCenter</property>
@@ -10343,7 +10331,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToolButton" id="AlignRight1">
+                                      <object class="GtkToolButton" id="Image-AlignRight">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:AlignRight</property>
@@ -10367,7 +10355,7 @@
                                     <property name="toolbar_style">icons</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="AlignTop1">
+                                      <object class="GtkToolButton" id="Image-AlignTop">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:AlignTop</property>
@@ -10378,7 +10366,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToolButton" id="AlignVerticalCenter1">
+                                      <object class="GtkToolButton" id="Image-AlignVerticalCenter">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:AlignVerticalCenter</property>
@@ -10389,7 +10377,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToolButton" id="AlignBottom4">
+                                      <object class="GtkToolButton" id="Image-AlignBottom">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:AlignBottom</property>
@@ -10467,7 +10455,7 @@
                                     <property name="toolbar_style">icons</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="AlignBottom8">
+                                      <object class="GtkToolButton" id="AlignBottom">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:ObjectForwardOne</property>
@@ -10478,7 +10466,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToolButton" id="BringToFront6">
+                                      <object class="GtkToolButton" id="Image-BringToFront">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:BringToFront</property>
@@ -10502,7 +10490,7 @@
                                     <property name="toolbar_style">icons</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="ObjectBackOne5">
+                                      <object class="GtkToolButton" id="Image-ObjectBackOne">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:ObjectBackOne</property>
@@ -10513,7 +10501,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToolButton" id="SendToBack5">
+                                      <object class="GtkToolButton" id="Image-SendToBack">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:SendToBack</property>
@@ -10594,8 +10582,8 @@
                         <property name="vexpand">True</property>
                         <property name="orientation">vertical</property>
                         <child>
-                          <object class="svtlo-ManagedMenuButton" id="graphicB:MenuGraphic">
-                            <property name="label" translatable="yes" context="notebookbar|graphicB">_Graphic</property>
+                          <object class="svtlo-ManagedMenuButton" id="Image-GraphicButton:MenuGraphic">
+                            <property name="label" translatable="yes" context="notebookbar|GraphicMenuButton">_Graphic</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="receives_default">False</property>
@@ -10620,7 +10608,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">1</property>
                             <child>
-                              <object class="GtkToolButton" id="FormatArea3">
+                              <object class="GtkToolButton" id="Image-FormatArea">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="valign">center</property>
@@ -10633,7 +10621,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkToolButton" id="GraphicDialog">
+                              <object class="GtkToolButton" id="Image-GraphicDialog">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="valign">center</property>
@@ -10732,7 +10720,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="InsertCaptionDialog5">
+                              <object class="GtkToolButton" id="Draw-InsertCaptionDialog">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="valign">center</property>
@@ -10766,7 +10754,7 @@
                                 <property name="toolbar_style">icons</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="ToggleObjectRotateMode">
+                                  <object class="GtkToolButton" id="Draw-ToggleObjectRotateMode">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ToggleObjectRotateMode</property>
@@ -10777,7 +10765,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="ToggleObjectBezierMode1">
+                                  <object class="GtkToolButton" id="Draw-ToggleObjectBezierMode">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ToggleObjectBezierMode</property>
@@ -10803,7 +10791,7 @@
                                 <property name="toolbar_style">icons</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="FlipVertical1">
+                                  <object class="GtkToolButton" id="Draw-FlipVertical">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:FlipVertical</property>
@@ -10814,7 +10802,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="FlipHorizontal3">
+                                  <object class="GtkToolButton" id="Draw-FlipHorizontal">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:FlipHorizontal</property>
@@ -10878,7 +10866,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="DrawText">
+                                  <object class="GtkToolButton" id="Draw-DrawText">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:DrawText</property>
@@ -10902,7 +10890,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="AddTextBox">
+                                  <object class="GtkToolButton" id="Draw-AddTextBox">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:AddTextBox</property>
@@ -10938,7 +10926,7 @@
                                 <property name="toolbar_style">icons</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="Line1">
+                                  <object class="GtkToolButton" id="Draw-Line">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Line</property>
@@ -10949,7 +10937,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="Polygon_Unfilled1">
+                                  <object class="GtkToolButton" id="Draw-Polygon_Unfilled">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Polygon_Unfilled</property>
@@ -10960,7 +10948,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="Bezier_Unfilled">
+                                  <object class="GtkToolButton" id="Draw-Bezier_Unfilled">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Bezier_Unfilled</property>
@@ -10971,7 +10959,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="ArrowsToolbox">
+                                  <object class="GtkToolButton" id="Draw-ArrowsToolbox">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ArrowsToolbox</property>
@@ -10995,7 +10983,7 @@
                                 <property name="toolbar_style">icons</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="rectangle1">
+                                  <object class="GtkToolButton" id="Draw-BasicShapes.rectangle">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:BasicShapes.rectangle</property>
@@ -11006,7 +10994,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="BasicShapes.round-rectangle">
+                                  <object class="GtkToolButton" id="Draw-BasicShapes.round-rectangle">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:BasicShapes.round-rectangle</property>
@@ -11017,7 +11005,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="ellipse1">
+                                  <object class="GtkToolButton" id="Draw-BasicShapes.ellipse">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:BasicShapes.ellipse</property>
@@ -11028,7 +11016,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="LineToolbox">
+                                  <object class="GtkToolButton" id="Draw-LineToolbox">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:LineToolbox</property>
@@ -11077,7 +11065,7 @@
                                 <property name="toolbar_style">icons</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="BasicShapes1">
+                                  <object class="GtkToolButton" id="Draw-BasicShapes">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:BasicShapes</property>
@@ -11088,7 +11076,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="SymbolShapes2">
+                                  <object class="GtkToolButton" id="Draw-SymbolShapes">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:SymbolShapes</property>
@@ -11099,7 +11087,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="ArrowShapes2">
+                                  <object class="GtkToolButton" id="Draw-ArrowShapes">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ArrowShapes</property>
@@ -11123,7 +11111,7 @@
                                 <property name="toolbar_style">icons</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="StarShapes2">
+                                  <object class="GtkToolButton" id="Draw-StarShapes">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:StarShapes</property>
@@ -11134,7 +11122,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="CalloutShapes2">
+                                  <object class="GtkToolButton" id="Draw-CalloutShapes">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:CalloutShapes</property>
@@ -11145,7 +11133,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="FlowChartShapes1">
+                                  <object class="GtkToolButton" id="Draw-FlowChartShapes">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:FlowChartShapes</property>
@@ -11212,7 +11200,7 @@
                                 <property name="toolbar_style">text</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="FormatLine1">
+                                  <object class="GtkToolButton" id="Draw-FormatLine">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:FormatLine</property>
@@ -11236,7 +11224,7 @@
                                 <property name="toolbar_style">text</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="FormatArea2">
+                                  <object class="GtkToolButton" id="Draw-FormatArea">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:FormatArea</property>
@@ -11272,7 +11260,7 @@
                                 <property name="toolbar_style">icons</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="LineEndStyle1">
+                                  <object class="GtkToolButton" id="Draw-LineEndStyle">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:LineEndStyle</property>
@@ -11283,8 +11271,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkMenuToolButton" id="XLineStyle">
-                                    <property name="use_action_appearance">False</property>
+                                  <object class="GtkMenuToolButton" id="Draw-XLineStyle">
                                     <property name="width_request">100</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
@@ -11297,7 +11284,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="XLineColor">
+                                  <object class="GtkToolButton" id="Draw-XLineColor">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:XLineColor</property>
@@ -11308,8 +11295,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkMenuToolButton" id="LineWidth2">
-                                    <property name="use_action_appearance">False</property>
+                                  <object class="GtkMenuToolButton" id="Draw-LineWidth">
                                     <property name="width_request">100</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
@@ -11336,7 +11322,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="FillStyle">
+                                  <object class="GtkToolButton" id="Draw-FillStyle">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:FillStyle</property>
@@ -11401,8 +11387,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkMenuToolButton" id="AnchorMenu3">
-                                <property name="use_action_appearance">False</property>
+                              <object class="GtkMenuToolButton" id="Draw-AnchorMenu">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="valign">center</property>
@@ -11437,7 +11422,7 @@
                                     <property name="toolbar_style">icons</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="WrapOff1">
+                                      <object class="GtkToolButton" id="Draw-WrapOff">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:WrapOff</property>
@@ -11448,7 +11433,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToolButton" id="WrapOn1">
+                                      <object class="GtkToolButton" id="Draw-WrapOn">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:WrapOn</property>
@@ -11459,7 +11444,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToolButton" id="WrapIdeal1">
+                                      <object class="GtkToolButton" id="Draw-WrapIdeal">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:WrapIdeal</property>
@@ -11483,7 +11468,7 @@
                                     <property name="toolbar_style">icons</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="WrapLeft1">
+                                      <object class="GtkToolButton" id="Draw-WrapLeft">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:WrapLeft</property>
@@ -11494,7 +11479,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToolButton" id="WrapThrough1">
+                                      <object class="GtkToolButton" id="Draw-WrapThrough">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:WrapThrough</property>
@@ -11505,7 +11490,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToolButton" id="WrapRight1">
+                                      <object class="GtkToolButton" id="Draw-WrapRight">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:WrapRight</property>
@@ -11554,7 +11539,7 @@
                                     <property name="toolbar_style">icons</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="ObjectAlignLeft">
+                                      <object class="GtkToolButton" id="Draw-ObjectAlignLeft">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:ObjectAlignLeft</property>
@@ -11565,7 +11550,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToolButton" id="AlignCenter">
+                                      <object class="GtkToolButton" id="Draw-AlignCenter">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:AlignCenter</property>
@@ -11576,7 +11561,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToolButton" id="ObjectAlignRight">
+                                      <object class="GtkToolButton" id="Draw-ObjectAlignRight">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:ObjectAlignRight</property>
@@ -11600,7 +11585,7 @@
                                     <property name="toolbar_style">icons</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="AlignUp">
+                                      <object class="GtkToolButton" id="Draw-AlignUp">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:AlignUp</property>
@@ -11611,7 +11596,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToolButton" id="AlignMiddle">
+                                      <object class="GtkToolButton" id="Draw-AlignMiddle">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:AlignMiddle</property>
@@ -11622,7 +11607,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToolButton" id="AlignDown">
+                                      <object class="GtkToolButton" id="Draw-AlignDown">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:AlignDown</property>
@@ -11671,7 +11656,7 @@
                                     <property name="toolbar_style">icons</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="AlignBottom3">
+                                      <object class="GtkToolButton" id="Draw-AlignBottom">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:ObjectForwardOne</property>
@@ -11682,7 +11667,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToolButton" id="BringToFront2">
+                                      <object class="GtkToolButton" id="Draw-BringToFront">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:BringToFront</property>
@@ -11706,7 +11691,7 @@
                                     <property name="toolbar_style">icons</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="ObjectBackOne2">
+                                      <object class="GtkToolButton" id="Draw-ObjectBackOne">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:ObjectBackOne</property>
@@ -11717,7 +11702,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToolButton" id="SendToBack1">
+                                      <object class="GtkToolButton" id="Draw-SendToBack">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:SendToBack</property>
@@ -11789,7 +11774,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="FormatGroup">
+                              <object class="GtkToolButton" id="Draw-FormatGroup">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:FormatGroup</property>
@@ -11821,7 +11806,7 @@
                                 <property name="toolbar_style">icons</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="EnterGroup">
+                                  <object class="GtkToolButton" id="Draw-EnterGroup">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:EnterGroup</property>
@@ -11847,7 +11832,7 @@
                                 <property name="toolbar_style">icons</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="LeaveGroup">
+                                  <object class="GtkToolButton" id="Draw-LeaveGroup">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:LeaveGroup</property>
@@ -11915,7 +11900,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="ExtrusionToggle">
+                                  <object class="GtkToolButton" id="Draw-ExtrusionToggle">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ExtrusionToggle</property>
@@ -11939,7 +11924,7 @@
                                 <property name="toolbar_style">icons</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="ExtrusionDepthFloater">
+                                  <object class="GtkToolButton" id="Draw-ExtrusionDepthFloater">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ExtrusionDepthFloater</property>
@@ -11950,7 +11935,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="ExtrusionDirectionFloater">
+                                  <object class="GtkToolButton" id="Draw-ExtrusionDirectionFloater">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ExtrusionDirectionFloater</property>
@@ -11961,8 +11946,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkMenuToolButton" id="Extrusion3DColor">
-                                    <property name="use_action_appearance">False</property>
+                                  <object class="GtkMenuToolButton" id="Draw-Extrusion3DColor">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Extrusion3DColor</property>
@@ -11973,8 +11957,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkMenuToolButton" id="ExtrusionSurfaceFloater">
-                                    <property name="use_action_appearance">False</property>
+                                  <object class="GtkMenuToolButton" id="Draw-ExtrusionSurfaceFloater">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ExtrusionSurfaceFloater</property>
@@ -12048,8 +12031,8 @@
                         <property name="vexpand">True</property>
                         <property name="orientation">vertical</property>
                         <child>
-                          <object class="svtlo-ManagedMenuButton" id="drab:MenuDraw">
-                            <property name="label" translatable="yes" context="notebookbar|drab">D_raw</property>
+                          <object class="svtlo-ManagedMenuButton" id="Draw-DrawButton:MenuDraw">
+                            <property name="label" translatable="yes" context="notebookbar|DrawMenuButton">D_raw</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="receives_default">False</property>
@@ -12099,7 +12082,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkToolButton" id="TransformDialog">
+                              <object class="GtkToolButton" id="Draw-TransformDialog">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="valign">center</property>
@@ -12172,7 +12155,7 @@
               </packing>
             </child>
             <child>
-              <object class="sfxlo-PriorityHBox" id="FrameBox">
+              <object class="sfxlo-PriorityHBox" id="ObjectBox">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <child>
@@ -12198,7 +12181,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="InsertCaptionDialog3">
+                              <object class="GtkToolButton" id="Object-InsertCaptionDialog">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="valign">center</property>
@@ -12234,7 +12217,7 @@
                                     <property name="toolbar_style">both-horiz</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="SetBorderStyle">
+                                      <object class="GtkToolButton" id="Object-SetBorderStyle">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:SetBorderStyle</property>
@@ -12258,7 +12241,7 @@
                                     <property name="toolbar_style">icons</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="LineStyle1">
+                                      <object class="GtkToolButton" id="Object-LineStyle">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:LineStyle</property>
@@ -12269,7 +12252,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToolButton" id="FrameLineColor2">
+                                      <object class="GtkToolButton" id="Object-FrameLineColor">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:FrameLineColor</property>
@@ -12304,7 +12287,7 @@
                                     <property name="toolbar_style">text</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="FormatArea1">
+                                      <object class="GtkToolButton" id="Object-FormatArea">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:FormatArea</property>
@@ -12328,7 +12311,7 @@
                                     <property name="toolbar_style">text</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="FillStyle2">
+                                      <object class="GtkToolButton" id="Object-FillStyle">
                                         <property name="width_request">200</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
@@ -12398,8 +12381,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkMenuToolButton" id="AnchorMenu2">
-                                <property name="use_action_appearance">False</property>
+                              <object class="GtkMenuToolButton" id="Object-AnchorMenu">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="valign">center</property>
@@ -12434,7 +12416,7 @@
                                     <property name="toolbar_style">icons</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="WrapOff2">
+                                      <object class="GtkToolButton" id="Object-WrapOff">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:WrapOff</property>
@@ -12445,7 +12427,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToolButton" id="WrapOn2">
+                                      <object class="GtkToolButton" id="Object-WrapOn">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:WrapOn</property>
@@ -12456,7 +12438,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToolButton" id="WrapIdeal2">
+                                      <object class="GtkToolButton" id="Object-WrapIdeal">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:WrapIdeal</property>
@@ -12480,7 +12462,7 @@
                                     <property name="toolbar_style">icons</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="WrapLeft2">
+                                      <object class="GtkToolButton" id="Object-WrapLeft">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:WrapLeft</property>
@@ -12491,7 +12473,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToolButton" id="WrapThrough2">
+                                      <object class="GtkToolButton" id="Object-WrapThrough">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:WrapThrough</property>
@@ -12502,7 +12484,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToolButton" id="WrapRight2">
+                                      <object class="GtkToolButton" id="Object-WrapRight">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:WrapRight</property>
@@ -12551,7 +12533,7 @@
                                     <property name="toolbar_style">icons</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="ObjectAlignLeft1">
+                                      <object class="GtkToolButton" id="Object-ObjectAlignLeft">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:ObjectAlignLeft</property>
@@ -12562,7 +12544,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToolButton" id="AlignCenter1">
+                                      <object class="GtkToolButton" id="Object-AlignCenter">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:AlignCenter</property>
@@ -12573,7 +12555,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToolButton" id="ObjectAlignRight1">
+                                      <object class="GtkToolButton" id="Object-ObjectAlignRight">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:ObjectAlignRight</property>
@@ -12597,7 +12579,7 @@
                                     <property name="toolbar_style">icons</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="AlignUp1">
+                                      <object class="GtkToolButton" id="Object-AlignUp">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:AlignUp</property>
@@ -12608,7 +12590,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToolButton" id="AlignMiddle1">
+                                      <object class="GtkToolButton" id="Object-AlignMiddle">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:AlignMiddle</property>
@@ -12619,7 +12601,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToolButton" id="AlignDown1">
+                                      <object class="GtkToolButton" id="Object-AlignDown">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:AlignDown</property>
@@ -12668,7 +12650,7 @@
                                     <property name="toolbar_style">icons</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="AlignBottom2">
+                                      <object class="GtkToolButton" id="Object-ObjectForwardOne">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:ObjectForwardOne</property>
@@ -12679,7 +12661,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToolButton" id="BringToFront3">
+                                      <object class="GtkToolButton" id="Object-BringToFront">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:BringToFront</property>
@@ -12703,7 +12685,7 @@
                                     <property name="toolbar_style">icons</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="ObjectBackOne1">
+                                      <object class="GtkToolButton" id="Object-ObjectBackOne">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:ObjectBackOne</property>
@@ -12714,7 +12696,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToolButton" id="SendToBack2">
+                                      <object class="GtkToolButton" id="Object-SendToBack">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:SendToBack</property>
@@ -12791,7 +12773,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="ChainFrames">
+                                  <object class="GtkToolButton" id="Object-ChainFrames">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ChainFrames</property>
@@ -12817,7 +12799,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="UnhainFrames">
+                                  <object class="GtkToolButton" id="Object-UnhainFrames">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:UnhainFrames</property>
@@ -12882,7 +12864,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="FormatGroup1">
+                              <object class="GtkToolButton" id="Object-FormatGroup">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:FormatGroup</property>
@@ -12914,7 +12896,7 @@
                                 <property name="toolbar_style">icons</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="EnterGroup1">
+                                  <object class="GtkToolButton" id="Object-EnterGroup">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:EnterGroup</property>
@@ -12940,7 +12922,7 @@
                                 <property name="toolbar_style">icons</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="LeaveGroup1">
+                                  <object class="GtkToolButton" id="Object-LeaveGroup">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:LeaveGroup</property>
@@ -13014,8 +12996,8 @@
                         <property name="vexpand">True</property>
                         <property name="orientation">vertical</property>
                         <child>
-                          <object class="svtlo-ManagedMenuButton" id="frame:MenuDraw">
-                            <property name="label" translatable="yes" context="notebookbar|frame:MenuDraw">Object</property>
+                          <object class="svtlo-ManagedMenuButton" id="Object-ObjectButton:MenuDraw">
+                            <property name="label" translatable="yes" context="notebookbar|ObjectMenuButton:MenuDraw">Object</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="receives_default">False</property>
@@ -13041,7 +13023,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">1</property>
                             <child>
-                              <object class="GtkToolButton" id="FrameDialog">
+                              <object class="GtkToolButton" id="Object-FrameDialog">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="valign">center</property>
@@ -13101,10 +13083,10 @@
               </packing>
             </child>
             <child type="tab">
-              <object class="GtkLabel" id="FrameLabel">
+              <object class="GtkLabel" id="ObjectLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="notebookbar|FrameLabel">Object</property>
+                <property name="label" translatable="yes" context="notebookbar|ObjectLabel">Object</property>
                 <style>
                   <class name="context-Frame"/>
                   <class name="context-OLE"/>
@@ -13116,7 +13098,7 @@
               </packing>
             </child>
             <child>
-              <object class="sfxlo-PriorityHBox" id="ToolBox">
+              <object class="sfxlo-PriorityHBox" id="ToolsBox">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <child>
@@ -13134,8 +13116,8 @@
                         <property name="vexpand">True</property>
                         <property name="orientation">vertical</property>
                         <child>
-                          <object class="svtlo-ManagedMenuButton" id="develop:MenuTools">
-                            <property name="label" translatable="yes" context="notebookbar|referenceb">_Tools</property>
+                          <object class="svtlo-ManagedMenuButton" id="Tools-TollsButton:MenuTools">
+                            <property name="label" translatable="yes" context="notebookbar|ToolsMenuButton">_Tools</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="receives_default">False</property>
@@ -13161,7 +13143,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">1</property>
                             <child>
-                              <object class="GtkToolButton" id="ShowFmExplorer">
+                              <object class="GtkToolButton" id="Tools-OptionsTreeDialog">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:OptionsTreeDialog</property>
@@ -13233,7 +13215,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="MacroRecorder">
+                              <object class="GtkToolButton" id="Tools-MacroRecorder">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:MacroRecorder</property>
@@ -13244,7 +13226,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkToolButton" id="RunMacro">
+                              <object class="GtkToolButton" id="Tools-RunMacro">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:RunMacro</property>
@@ -13275,7 +13257,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="BasicIDEAppear1">
+                                  <object class="GtkToolButton" id="Tools-BasicIDEAppear">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:BasicIDEAppear</property>
@@ -13299,7 +13281,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="MacroOrganizer1">
+                                  <object class="GtkToolButton" id="Tools-MacroOrganizer">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:MacroOrganizer?TabId:short=1</property>
@@ -13361,7 +13343,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="MailMergeWizard">
+                              <object class="GtkToolButton" id="Tools-MailMergeWizard">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:MailMergeWizard</property>
@@ -13394,7 +13376,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="InsertEnvelope">
+                                  <object class="GtkToolButton" id="Tools-InsertEnvelope">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:InsertEnvelope</property>
@@ -13420,7 +13402,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="SendMail">
+                                  <object class="GtkToolButton" id="Tools-SendMail">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:SendMail</property>
@@ -13485,7 +13467,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="SwitchControlDesignMode">
+                              <object class="GtkToolButton" id="Tools-SwitchControlDesignMode">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:SwitchControlDesignMode</property>
@@ -13518,7 +13500,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="UseWizards1">
+                                  <object class="GtkToolButton" id="Tools-UseWizards">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:UseWizards</property>
@@ -13544,7 +13526,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="GroupBox4">
+                                  <object class="GtkToolButton" id="Tools-GroupBox">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:GroupBox</property>
@@ -13613,7 +13595,7 @@
                                 <property name="toolbar_style">icons</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="Label">
+                                  <object class="GtkToolButton" id="Tools-Label">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Label</property>
@@ -13624,7 +13606,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="Edit">
+                                  <object class="GtkToolButton" id="Tools-Edit">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Edit</property>
@@ -13635,7 +13617,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="CheckBox">
+                                  <object class="GtkToolButton" id="Tools-CheckBox">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:CheckBox</property>
@@ -13646,7 +13628,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="RadioButton">
+                                  <object class="GtkToolButton" id="Tools-RadioButton">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:RadioButton</property>
@@ -13657,7 +13639,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="ListBox">
+                                  <object class="GtkToolButton" id="Tools-ListBox">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ListBox</property>
@@ -13668,7 +13650,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="ComboBox">
+                                  <object class="GtkToolButton" id="Tools-ComboBox">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ComboBox</property>
@@ -13692,7 +13674,7 @@
                                 <property name="toolbar_style">icons</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="FormattedField">
+                                  <object class="GtkToolButton" id="Tools-FormattedField">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:FormattedField</property>
@@ -13703,7 +13685,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="DateField">
+                                  <object class="GtkToolButton" id="Tools-DateField">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:DateField</property>
@@ -13714,7 +13696,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="TimeField">
+                                  <object class="GtkToolButton" id="Tools-TimeField">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:TimeField</property>
@@ -13725,7 +13707,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="NumericField">
+                                  <object class="GtkToolButton" id="Tools-NumericField">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:NumericField</property>
@@ -13736,7 +13718,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="CurrencyField">
+                                  <object class="GtkToolButton" id="Tools-CurrencyField">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:CurrencyField</property>
@@ -13747,7 +13729,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="PatternField">
+                                  <object class="GtkToolButton" id="Tools-PatternField">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:PatternField</property>
@@ -13816,7 +13798,7 @@
                                 <property name="toolbar_style">icons</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="Pushbutton">
+                                  <object class="GtkToolButton" id="Tools-Pushbutton">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Pushbutton</property>
@@ -13827,7 +13809,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="Imagebutton">
+                                  <object class="GtkToolButton" id="Tools-Imagebutton">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Imagebutton</property>
@@ -13838,7 +13820,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="ImageControl1">
+                                  <object class="GtkToolButton" id="Tools-ImageControl">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ImageControl</property>
@@ -13862,7 +13844,7 @@
                                 <property name="toolbar_style">icons</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="FileControl1">
+                                  <object class="GtkToolButton" id="Tools-FileControl">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:FileControl</property>
@@ -13873,7 +13855,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="NavigationBar">
+                                  <object class="GtkToolButton" id="Tools-NavigationBar">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:NavigationBar</property>
@@ -13884,7 +13866,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="Grid">
+                                  <object class="GtkToolButton" id="Tools-Grid">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Grid</property>
@@ -13953,7 +13935,7 @@
                                 <property name="toolbar_style">icons</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="FormProperties">
+                                  <object class="GtkToolButton" id="Tools-FormProperties">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:FormProperties</property>
@@ -13964,7 +13946,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="TabDialog">
+                                  <object class="GtkToolButton" id="Tools-TabDialog">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:TabDialog</property>
@@ -13975,7 +13957,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="ControlProperties">
+                                  <object class="GtkToolButton" id="Tools-ControlProperties">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ControlProperties</property>
@@ -13999,7 +13981,7 @@
                                 <property name="toolbar_style">icons</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="ShowFmExplorer1">
+                                  <object class="GtkToolButton" id="Tools-ShowFmExplorer">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ShowFmExplorer</property>
@@ -14010,7 +13992,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="OpenReadOnly">
+                                  <object class="GtkToolButton" id="Tools-OpenReadOnly">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:OpenReadOnly</property>
@@ -14021,7 +14003,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="AutoControlFocus">
+                                  <object class="GtkToolButton" id="Tools-AutoControlFocus">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:AutoControlFocus</property>
-- 
cgit