notebookbar: reduced padding

Change-Id: I43df4ba611d7b377829ac3b5f17ff26077e9f13d

3 files changed, 116 insertions, 69 deletions

diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui b/sc/uiconfig/scalc/ui/notebookbar.ui
index 7c6d70d6f14d..8b75850678e4 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -238,6 +238,7 @@
                         <property name="can_focus">False</property>
                         <child>
                           <object class="GtkButton" id="Paste">
+                            <property name="width_request">70</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -296,6 +297,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="FormatPaintbrush">
+                            <property name="width_request">130</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -1378,6 +1380,7 @@
                     <property name="can_focus">False</property>
                     <child>
                       <object class="GtkButton" id="DataDataPilotRun">
+                        <property name="width_request">130</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -1391,12 +1394,6 @@
                         <property name="position">0</property>
                       </packing>
                     </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -1417,14 +1414,12 @@
                   </packing>
                 </child>
                 <child>
-                  <placeholder/>
-                </child>
-                <child>
                   <object class="GtkBox" id="box16">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <child>
                       <object class="GtkButton" id="InsertGraphic">
+                        <property name="width_request">60</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -1441,6 +1436,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="InsertAVMedia">
+                        <property name="width_request">110</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -1457,6 +1453,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="InsertObjectChart">
+                        <property name="width_request">60</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -1507,6 +1504,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="EditHeaderAndFooter">
+                    <property name="width_request">150</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -1523,6 +1521,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="InsertAnnotation">
+                    <property name="width_request">80</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -1539,6 +1538,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="HyperlinkDialog">
+                    <property name="width_request">80</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -1567,6 +1567,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="DrawText">
+                    <property name="width_request">70</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -1599,6 +1600,7 @@
                     <property name="can_focus">False</property>
                     <child>
                       <object class="GtkButton" id="InsertSymbol">
+                        <property name="width_request">130</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -1615,6 +1617,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="InsertObjectStarMath">
+                        <property name="width_request">70</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -1663,6 +1666,7 @@
                     <property name="can_focus">False</property>
                     <child>
                       <object class="GtkButton" id="PageFormatDialog">
+                        <property name="width_request">100</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -1679,6 +1683,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="EditPrintArea">
+                        <property name="width_request">120</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -1693,9 +1698,6 @@
                         <property name="position">1</property>
                       </packing>
                     </child>
-                    <child>
-                      <placeholder/>
-                    </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -1758,23 +1760,12 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkSeparator" id="separator13">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="orientation">vertical</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">3</property>
-                  </packing>
-                </child>
-                <child>
                   <object class="GtkBox" id="box18">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <child>
                       <object class="GtkButton" id="BringToFront">
+                        <property name="width_request">100</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -1791,6 +1782,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="SendToBack">
+                        <property name="width_request">100</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -1807,6 +1799,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="FormatGroup">
+                        <property name="width_request">70</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -1823,6 +1816,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="FormatUngroup">
+                        <property name="width_request">70</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -1837,12 +1831,6 @@
                         <property name="position">3</property>
                       </packing>
                     </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -1905,9 +1893,6 @@
                         <property name="position">1</property>
                       </packing>
                     </child>
-                    <child>
-                      <placeholder/>
-                    </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -2002,6 +1987,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="DataSort1">
+                        <property name="width_request">60</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -2018,6 +2004,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="DataFilterAutoFilter">
+                        <property name="width_request">80</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -2229,9 +2216,6 @@
                         <property name="position">5</property>
                       </packing>
                     </child>
-                    <child>
-                      <placeholder/>
-                    </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -2266,6 +2250,7 @@
                     <property name="can_focus">False</property>
                     <child>
                       <object class="GtkButton" id="SpellDialog">
+                        <property name="width_request">70</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -2282,6 +2267,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="SpellOnline">
+                        <property name="width_request">180</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -2298,6 +2284,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="ThesaurusDialog">
+                        <property name="width_request">80</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -2337,6 +2324,7 @@
                     <property name="can_focus">False</property>
                     <child>
                       <object class="GtkButton" id="InsertAnnotation1">
+                        <property name="width_request">80</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -2460,6 +2448,7 @@
                     <property name="can_focus">False</property>
                     <child>
                       <object class="GtkButton" id="Protect">
+                        <property name="width_request">105</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -2476,6 +2465,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="ToolProtectionDocument">
+                        <property name="width_request">145</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -2505,9 +2495,6 @@
                         <property name="position">2</property>
                       </packing>
                     </child>
-                    <child>
-                      <placeholder/>
-                    </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -2570,9 +2557,6 @@
                         <property name="position">1</property>
                       </packing>
                     </child>
-                    <child>
-                      <placeholder/>
-                    </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -2597,7 +2581,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <child>
-                      <object class="GtkButton" id="Protect1">
+                      <object class="GtkButton" id="ViewRowColumnHeaders1">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -2612,7 +2596,8 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkButton" id="Protect2">
+                      <object class="GtkButton" id="ToggleSheetGrid2">
+                        <property name="width_request">250</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -2667,6 +2652,7 @@
                     <property name="can_focus">False</property>
                     <child>
                       <object class="GtkButton" id="Zoom">
+                        <property name="width_request">70</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -2748,6 +2734,7 @@
                     <property name="can_focus">False</property>
                     <child>
                       <object class="GtkButton" id="SplitWindow">
+                        <property name="width_request">100</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -2764,6 +2751,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="FreezePanes">
+                        <property name="width_request">200</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -2778,9 +2766,6 @@
                         <property name="position">1</property>
                       </packing>
                     </child>
-                    <child>
-                      <placeholder/>
-                    </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
diff --git a/sd/uiconfig/simpress/ui/notebookbar.ui b/sd/uiconfig/simpress/ui/notebookbar.ui
index cd78e3772322..fafd7ef1958c 100644
--- a/sd/uiconfig/simpress/ui/notebookbar.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar.ui
@@ -98,6 +98,11 @@
     <property name="can_focus">False</property>
     <property name="pixbuf">cmd/lc_sendtoback.png</property>
   </object>
+  <object class="GtkImage" id="ShowAnnotationsImg">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="pixbuf">cmd/lc_showannotations.png</property>
+  </object>
   <object class="GtkImage" id="SpellDialogImg">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -123,6 +128,16 @@
     <property name="can_focus">False</property>
     <property name="pixbuf">cmd/lc_zoom.png</property>
   </object>
+  <object class="GtkImage" id="ZoomOptimalImg">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="pixbuf">cmd/lc_zoomoptimal.png</property>
+  </object>
+  <object class="GtkImage" id="ZoomPageImg">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="pixbuf">cmd/lc_zoompage.png</property>
+  </object>
   <object class="GtkGrid" id="NotebookBar">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -213,6 +228,7 @@
                         <property name="can_focus">False</property>
                         <child>
                           <object class="GtkButton" id="Paste">
+                            <property name="width_request">70</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -271,6 +287,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="FormatPaintbrush">
+                            <property name="width_request">130</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -310,6 +327,7 @@
                         <property name="can_focus">False</property>
                         <child>
                           <object class="GtkButton" id="InsertSlide">
+                            <property name="width_request">80</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -1244,6 +1262,7 @@
                         <property name="can_focus">False</property>
                         <child>
                           <object class="GtkButton" id="BringToFront">
+                            <property name="width_request">100</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -1302,6 +1321,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="SendToBack">
+                            <property name="width_request">100</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -1354,6 +1374,7 @@
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkButton" id="InsertSlide1">
+                    <property name="width_request">80</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -1382,6 +1403,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="InsertTable">
+                    <property name="width_request">60</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -1414,6 +1436,7 @@
                     <property name="can_focus">False</property>
                     <child>
                       <object class="GtkButton" id="InsertGraphic">
+                        <property name="width_request">60</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -1472,6 +1495,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="InsertObjectChart">
+                        <property name="width_request">60</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -1663,6 +1687,7 @@
                     <property name="can_focus">False</property>
                     <child>
                       <object class="GtkButton" id="HyperlinkDialog">
+                        <property name="width_request">80</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -1679,6 +1704,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="InsertAnnotation">
+                        <property name="width_request">80</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -1695,6 +1721,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="Text2">
+                        <property name="width_request">80</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -1711,6 +1738,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="HeaderAndFooter">
+                        <property name="width_request">140</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -1727,6 +1755,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="FontworkGalleryFloater">
+                        <property name="width_request">120</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -1766,6 +1795,7 @@
                     <property name="can_focus">False</property>
                     <child>
                       <object class="GtkButton" id="InsertSymbol">
+                        <property name="width_request">130</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -1782,6 +1812,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="InsertMath">
+                        <property name="width_request">75</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -1817,6 +1848,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="ImportFromFile">
+                    <property name="width_request">50</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -1858,6 +1890,7 @@
                     <property name="can_focus">False</property>
                     <child>
                       <object class="GtkButton" id="Presentation">
+                        <property name="width_request">150</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -1874,6 +1907,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="PresentationCurrentSlide">
+                        <property name="width_request">170</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -1913,6 +1947,7 @@
                     <property name="can_focus">False</property>
                     <child>
                       <object class="GtkButton" id="RehearseTimings">
+                        <property name="width_request">140</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -2019,6 +2054,7 @@
                     <property name="can_focus">False</property>
                     <child>
                       <object class="GtkButton" id="SpellDialog">
+                        <property name="width_request">70</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -2035,6 +2071,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="SpellOnline">
+                        <property name="width_request">180</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -2051,6 +2088,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="ThesaurusDialog">
+                        <property name="width_request">80</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -2090,6 +2128,7 @@
                     <property name="can_focus">False</property>
                     <child>
                       <object class="GtkButton" id="InsertAnnotation1">
+                        <property name="width_request">80</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -2343,12 +2382,14 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="ShowAnnotations">
+                    <property name="width_request">80</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">.uno:ShowAnnotations</property>
+                    <property name="image">ShowAnnotationsImg</property>
                     <property name="relief">none</property>
-                    <property name="xalign">0</property>
+                    <property name="image_position">top</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -2374,6 +2415,7 @@
                     <property name="can_focus">False</property>
                     <child>
                       <object class="GtkButton" id="Zoom">
+                        <property name="width_request">60</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -2390,6 +2432,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="ZoomOptimal">
+                        <property name="width_request">100</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -2406,6 +2449,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="ZoomPage">
+                        <property name="width_request">90</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -2449,7 +2493,6 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:OutputQualityColor</property>
-                        <property name="image">OutputQualityColorImg</property>
                         <property name="relief">none</property>
                         <property name="image_position">top</property>
                       </object>
@@ -2465,7 +2508,6 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:OutputQualityGrayscale</property>
-                        <property name="image">ZoomPageImg3</property>
                         <property name="relief">none</property>
                         <property name="image_position">top</property>
                       </object>
@@ -2481,7 +2523,6 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:OutputQualityBlackWhite</property>
-                        <property name="image">ZoomPageImg2</property>
                         <property name="relief">none</property>
                         <property name="image_position">top</property>
                       </object>
@@ -2528,14 +2569,4 @@
       </packing>
     </child>
   </object>
-  <object class="GtkImage" id="ZoomOptimalImg">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="pixbuf">cmd/lc_zoomoptimal.png</property>
-  </object>
-  <object class="GtkImage" id="ZoomPageImg">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="pixbuf">cmd/lc_zoompage.png</property>
-  </object>
 </interface>
diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui b/sw/uiconfig/swriter/ui/notebookbar.ui
index ed987f454000..cd60ae1541ff 100644
--- a/sw/uiconfig/swriter/ui/notebookbar.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar.ui
@@ -264,6 +264,7 @@
                     <property name="can_focus">False</property>
                     <child>
                       <object class="GtkButton" id="button5">
+                        <property name="width_request">60</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -325,6 +326,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="FormatPaintbrush">
+                        <property name="width_request">130</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -1163,6 +1165,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="SearchDialog">
+                    <property name="width_request">120</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -1255,6 +1258,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="inserttable">
+                    <property name="width_request">110</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -1288,6 +1292,7 @@
                     <property name="can_focus">False</property>
                     <child>
                       <object class="GtkButton" id="InsertGraphic">
+                        <property name="width_request">60</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -1305,6 +1310,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="InsertAVMedia">
+                        <property name="width_request">110</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -1322,6 +1328,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="Gallery">
+                        <property name="width_request">105</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -1339,6 +1346,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="InsertObjectChart">
+                        <property name="width_request">60</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -1421,6 +1429,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="insertreferencefield">
+                        <property name="width_request">125</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -1456,10 +1465,12 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="Insertnnotation">
+                    <property name="width_request">80</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">.uno:InsertAnnotation</property>
+                    <property name="image">InsertAnnotationImg</property>
                     <property name="relief">none</property>
                     <property name="image_position">top</property>
                     <property name="always_show_image">True</property>
@@ -1488,6 +1499,7 @@
                     <property name="can_focus">False</property>
                     <child>
                       <object class="GtkButton" id="InsertPageHeader">
+                        <property name="width_request">70</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -1505,6 +1517,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="InsertPageFooter">
+                        <property name="width_request">70</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -1545,6 +1558,7 @@
                     <property name="can_focus">False</property>
                     <child>
                       <object class="GtkButton" id="DrawText">
+                        <property name="width_request">70</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -1726,6 +1740,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="EditGlossary">
+                    <property name="width_request">80</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -1769,6 +1784,7 @@
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkButton" id="PageDialog">
+                        <property name="width_request">110</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -1786,6 +1802,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="FormatColumns">
+                        <property name="width_request">80</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -1835,6 +1852,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="Hyphenate">
+                        <property name="width_request">100</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -2244,6 +2262,7 @@
                     <child>
                       <object class="GtkButton" id="InsertMultiIndex">
                         <property name="label" translatable="yes">Table of Contents</property>
+                        <property name="width_request">130</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -2261,6 +2280,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="InsertIndexesEntry">
+                        <property name="width_request">90</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -2348,6 +2368,7 @@
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkButton" id="InsertFootnote">
+                        <property name="width_request">110</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -2447,9 +2468,6 @@
                         <property name="position">0</property>
                       </packing>
                     </child>
-                    <child>
-                      <placeholder/>
-                    </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -2475,7 +2493,8 @@
                     <property name="can_focus">False</property>
                     <property name="spacing">6</property>
                     <child>
-                      <object class="GtkButton" id="BibliographyComponent1">
+                      <object class="GtkButton" id="InsertCaptionDialog1">
+                        <property name="width_request">70</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -2496,9 +2515,6 @@
                         <property name="can_focus">False</property>
                         <property name="orientation">vertical</property>
                         <child>
-                          <placeholder/>
-                        </child>
-                        <child>
                           <object class="GtkButton" id="InsertAuthoritiesEntry">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -2571,6 +2587,7 @@
                     <property name="can_focus">False</property>
                     <child>
                       <object class="GtkButton" id="SpellingAndGrammarDialog">
+                        <property name="width_request">160</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -2588,6 +2605,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="SpellOnline">
+                        <property name="width_request">180</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -2605,6 +2623,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="ThesaurusDialog">
+                        <property name="width_request">90</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -2661,11 +2680,11 @@
                     <property name="can_focus">False</property>
                     <child>
                       <object class="GtkButton" id="InsertAnnotation">
+                        <property name="width_request">80</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:InsertAnnotation</property>
-                        <property name="image">InsertAnnotationImg</property>
                         <property name="relief">none</property>
                         <property name="image_position">top</property>
                         <property name="always_show_image">True</property>
@@ -2717,6 +2736,7 @@
                     <property name="can_focus">False</property>
                     <child>
                       <object class="GtkButton" id="TrackChanges">
+                        <property name="width_request">120</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -2734,6 +2754,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="AcceptTrackedChanges">
+                        <property name="width_request">125</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -2908,6 +2929,7 @@
                     <property name="can_focus">False</property>
                     <child>
                       <object class="GtkButton" id="CompareDocuments">
+                        <property name="width_request">140</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -2925,6 +2947,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="MergeDocuments">
+                        <property name="width_request">140</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -2975,6 +2998,7 @@
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkButton" id="PrintPreview">
+                        <property name="width_request">110</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -3091,11 +3115,13 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="GridVisible">
+                        <property name="width_request">100</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:GridVisible</property>
                         <property name="image">GridVisibleImg</property>
+                        <property name="relief">none</property>
                         <property name="image_position">top</property>
                         <property name="always_show_image">True</property>
                       </object>
@@ -3131,6 +3157,7 @@
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkButton" id="Zoom">
+                        <property name="width_request">60</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -3148,6 +3175,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="Zoom100Percent">
+                        <property name="width_request">60</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -3165,6 +3193,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="ZoomOptimal">
+                        <property name="width_request">100</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -3325,6 +3354,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="InsertCaptionDialog">
+                    <property name="width_request">70</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -3630,6 +3660,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="TableSort">
+                    <property name="width_request">60</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>