NB grouped writer: update styles commands to show icons in dropdown

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

5 files changed, 217 insertions, 183 deletions

diff --git a/icon-themes/sifr/cmd/sc_loadstyles.png b/icon-themes/sifr/cmd/sc_loadstyles.png
new file mode 100644
index 000000000000..efe51880bd07
--- /dev/null
+++ b/icon-themes/sifr/cmd/sc_loadstyles.png
diff --git a/icon-themes/sifr_dark/cmd/sc_loadstyles.png b/icon-themes/sifr_dark/cmd/sc_loadstyles.png
new file mode 100644
index 000000000000..4b077f36717f
--- /dev/null
+++ b/icon-themes/sifr_dark/cmd/sc_loadstyles.png
diff --git a/icon-themes/sifr_svg/cmd/sc_loadstyles.svg b/icon-themes/sifr_svg/cmd/sc_loadstyles.svg
new file mode 100644
index 000000000000..3d35bd7643e6
--- /dev/null
+++ b/icon-themes/sifr_svg/cmd/sc_loadstyles.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+ <path
+     style="fill:#555753"
+     d="M 4.8125,1 C 4.3541,1.0875 3.99178,1.5334 4,2 V 9 H 6 V 3 h 4 v 3 h 3 v 3 h 2 V 5.5625 C 15.006,5.2984 14.9024,5.03355 14.71875,4.84375 l -3.5625,-3.5625 C 10.96647,1.09755 10.70156,0.99388 10.4375,1 H 5 C 4.9688,0.999 4.93745,0.999 4.90625,1 4.87505,0.999 4.8437,0.999 4.8125,1 Z M 0.53125,5 C 0.24212,5 0,5.24205 0,5.53125 v 9.9375 C 0,15.76725 0.23264,16 0.53125,16 h 13.8125 c 0.2986,0 0.53125,-0.23265 0.53125,-0.53125 L 16,10.552734 c 0,-0.2891 -0.24212,-0.53125 -0.53125,-0.53125 H 3.875 L 3,13.5 C 3,13.777 2.777,14 2.5,14 2.223,14 2,13.777 2,13.5 V 8.5039062 c 0,-0.2769999 0.223,-0.5 0.5,-0.5 H 3 V 5 Z"
+     />
+ </svg>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
index e9b5b9a15855..422a7237c5cf 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
@@ -2618,7 +2618,7 @@
       <object class="GtkMenuItem" id="MenuStyles-TextBody">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:StyleApply?Style:string=Text body&amp;FamilyName:string=ParagraphStyles</property>
+        <property name="action_name">.uno:TextBodyParaStyle</property>
       </object>
     </child>
     <child>
@@ -2631,42 +2631,42 @@
       <object class="GtkMenuItem" id="MenuStyles-Title">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:StyleApply?Style:string=Title&amp;FamilyName:string=ParagraphStyles</property>
+        <property name="action_name">.uno:TitleParaStyle</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuStyles-Subtitle">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:StyleApply?Style:string=Subtitle&amp;FamilyName:string=ParagraphStyles</property>
+        <property name="action_name">.uno:SubtitleParaStyle</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuStyles-Heading1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:StyleApply?Style:string=Heading 1&amp;FamilyName:string=ParagraphStyles</property>
+        <property name="action_name">.uno:Heading1ParaStyle</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuStyles-Heading2">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:StyleApply?Style:string=Heading 2&amp;FamilyName:string=ParagraphStyles</property>
+        <property name="action_name">.uno:Heading2ParaStyle</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuStyles-Heading3">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:StyleApply?Style:string=Heading 3&amp;FamilyName:string=ParagraphStyles</property>
+        <property name="action_name">.uno:Heading3ParaStyle</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuStyles-Heading4">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:StyleApply?Style:string=Heading 4&amp;FamilyName:string=ParagraphStyles</property>
+        <property name="action_name">.uno:Heading4ParaStyle</property>
       </object>
     </child>
     <child>
@@ -2679,35 +2679,35 @@
       <object class="GtkMenuItem" id="MenuStyles-DefaultStyle">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:StyleApply?Style:string=Standard&amp;FamilyName:string=CharacterStyles</property>
+        <property name="action_name">.uno:DefaultCharStyle</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuStyles-Emphasis">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:StyleApply?Style:string=Emphasis&amp;FamilyName:string=CharacterStyles</property>
+        <property name="action_name">.uno:EmphasisCharStyle</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuStyles-EmphasisStrong">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:StyleApply?Style:string=Strong Emphasis&amp;FamilyName:string=CharacterStyles</property>
+        <property name="action_name">.uno:StrongEmphasisCharStyle</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuStyles-Citation">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:StyleApply?Style:string=Citation&amp;FamilyName:string=CharacterStyles</property>
+        <property name="action_name">.uno:QuoteCharStyle</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuStyles-SourceCode">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:StyleApply?Style:string=Source Text&amp;FamilyName:string=CharacterStyles</property>
+        <property name="action_name">.uno:SourceCharStyle</property>
       </object>
     </child>
     <child>
@@ -2720,28 +2720,42 @@
       <object class="GtkMenuItem" id="MenuStyles-ListStyle">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:StyleApply?Style:string=List 1&amp;FamilyName:string=NumberingStyles</property>
+        <property name="action_name">.uno:BulletListStyle</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuStyles-Numbering_123">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:StyleApply?Style:string=Numbering 123&amp;FamilyName:string=NumberingStyles</property>
+        <property name="action_name">.uno:NumberListStyle</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuStyles-Numbering_abc">
+      <object class="GtkMenuItem" id="MenuStyles-AlphaListStyle">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:StyleApply?Style:string=Numbering abc&amp;FamilyName:string=NumberingStyles</property>
+        <property name="action_name">.uno:AlphaListStyle</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuStyles-Numbering_IVX">
+      <object class="GtkMenuItem" id="MenuStyles-AlphaLowListStyle">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:StyleApply?Style:string=Numbering IVX&amp;FamilyName:string=NumberingStyles</property>
+        <property name="action_name">.uno:AlphaLowListStyle</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuStyles-RomanListStyle">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:RomanListStyle</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuStyles-RomanLowListStyle">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:RomanLowListStyle</property>
       </object>
     </child>
     <child>
@@ -3889,11 +3903,11 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-OptionalBox" id="Default-Section-Paragraph">
+                      <object class="sfxlo-OptionalBox" id="Default-Section-Insert">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
-                          <object class="GtkSeparator" id="separator6">
+                          <object class="GtkSeparator" id="separator18">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="margin_top">5</property>
@@ -3908,120 +3922,58 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkBox" id="Section5">
+                          <object class="GtkBox" id="Section6">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="orientation">vertical</property>
                             <child>
-                              <object class="GtkBox" id="box13">
+                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom6">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="can_focus">True</property>
+                                <property name="toolbar_style">icons</property>
+                                <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="ExtBottom2">
+                                  <object class="GtkToolButton" id="Default-InsertGraphic">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="Default-LeftPara">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:LeftPara</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Default-CenterPara">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:CenterPara</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Default-RightPara">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:RightPara</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Default-JustifyPara">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:JustifyPara</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
+                                    <property name="can_focus">False</property>
+                                    <property name="action_name">.uno:InsertGraphic</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
+                                    <property name="homogeneous">True</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkSeparator" id="separator140">
+                                  <object class="GtkMenuToolButton" id="Default-InsertTable">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="margin_top">5</property>
-                                    <property name="margin_bottom">5</property>
-                                    <property name="hexpand">True</property>
-                                    <property name="orientation">vertical</property>
+                                    <property name="action_name">.uno:InsertTable</property>
                                   </object>
                                   <packing>
-                                    <property name="expand">True</property>
-                                    <property name="fill">True</property>
-                                    <property name="padding">5</property>
-                                    <property name="position">1</property>
+                                    <property name="expand">False</property>
+                                    <property name="homogeneous">True</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="SectionBottom35">
+                                  <object class="GtkToolButton" id="Default-CharmapControl">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkMenuToolButton" id="Default-DefaultBullet">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:DefaultBullet</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkMenuToolButton" id="Default-DefaultNumbering">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:DefaultNumbering</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
+                                    <property name="can_focus">False</property>
+                                    <property name="action_name">.uno:CharmapControl</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">2</property>
+                                    <property name="homogeneous">True</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkToolButton" id="Default-InsertPagebreak">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="action_name">.uno:InsertPagebreak</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="homogeneous">True</property>
                                   </packing>
                                 </child>
                               </object>
@@ -4032,12 +3984,12 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkBox" id="box2">
+                              <object class="GtkBox" id="box44">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <child>
-                                  <object class="svtlo-ManagedMenuButton" id="Default-Paragraph:MenuParagraph">
-                                    <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|ParagraphButton">_Paragraph</property>
+                                  <object class="svtlo-ManagedMenuButton" id="Default-Insert:MenuInsert">
+                                    <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|InsertButton">_Insert</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="focus_on_click">False</property>
@@ -4052,7 +4004,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="ExtBottom8">
+                                  <object class="sfxlo-NotebookbarToolBox" id="ExtTop6">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="halign">end</property>
@@ -4060,21 +4012,10 @@
                                     <property name="toolbar_style">icons</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkMenuToolButton" id="Default-LineSpacing">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:LineSpacing</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkMenuToolButton" id="Default-BackgroundColor">
+                                      <object class="GtkToolButton" id="Default-InsertDraw">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:BackgroundColor</property>
+                                        <property name="action_name">.uno:InsertDraw</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -4103,7 +4044,7 @@
                           </packing>
                         </child>
                         <style>
-                          <class name="priority-6"/>
+                          <class name="priority-5"/>
                         </style>
                       </object>
                       <packing>
@@ -4113,11 +4054,11 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-OptionalBox" id="Default-Section-Insert">
+                      <object class="sfxlo-OptionalBox" id="Default-Section-Paragraph">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
-                          <object class="GtkSeparator" id="separator18">
+                          <object class="GtkSeparator" id="separator6">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="margin_top">5</property>
@@ -4132,58 +4073,120 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkBox" id="Section6">
+                          <object class="GtkBox" id="Section5">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="orientation">vertical</property>
                             <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom6">
+                              <object class="GtkBox" id="box13">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Default-InsertGraphic">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:InsertGraphic</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
+                                <property name="can_focus">False</property>
                                 <child>
-                                  <object class="GtkMenuToolButton" id="Default-InsertTable">
+                                  <object class="sfxlo-NotebookbarToolBox" id="ExtBottom2">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:InsertTable</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="toolbar_style">icons</property>
+                                    <property name="show_arrow">False</property>
+                                    <child>
+                                      <object class="GtkToolButton" id="Default-LeftPara">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="action_name">.uno:LeftPara</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="homogeneous">True</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkToolButton" id="Default-CenterPara">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="action_name">.uno:CenterPara</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="homogeneous">True</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkToolButton" id="Default-RightPara">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="action_name">.uno:RightPara</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="homogeneous">True</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkToolButton" id="Default-JustifyPara">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="action_name">.uno:JustifyPara</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="homogeneous">True</property>
+                                      </packing>
+                                    </child>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">0</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="Default-CharmapControl">
+                                  <object class="GtkSeparator" id="separator140">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:CharmapControl</property>
+                                    <property name="margin_top">5</property>
+                                    <property name="margin_bottom">5</property>
+                                    <property name="hexpand">True</property>
+                                    <property name="orientation">vertical</property>
                                   </object>
                                   <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
+                                    <property name="padding">5</property>
+                                    <property name="position">1</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="Default-InsertPagebreak">
+                                  <object class="sfxlo-NotebookbarToolBox" id="SectionBottom35">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:InsertPagebreak</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="toolbar_style">icons</property>
+                                    <property name="show_arrow">False</property>
+                                    <child>
+                                      <object class="GtkMenuToolButton" id="Default-DefaultBullet">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="action_name">.uno:DefaultBullet</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="homogeneous">True</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkMenuToolButton" id="Default-DefaultNumbering">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="action_name">.uno:DefaultNumbering</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="homogeneous">True</property>
+                                      </packing>
+                                    </child>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">2</property>
                                   </packing>
                                 </child>
                               </object>
@@ -4194,12 +4197,12 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkBox" id="box44">
+                              <object class="GtkBox" id="box2">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <child>
-                                  <object class="svtlo-ManagedMenuButton" id="Default-Insert:MenuInsert">
-                                    <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|InsertButton">_Insert</property>
+                                  <object class="svtlo-ManagedMenuButton" id="Default-Paragraph:MenuParagraph">
+                                    <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|ParagraphButton">_Paragraph</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="focus_on_click">False</property>
@@ -4214,7 +4217,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="ExtTop6">
+                                  <object class="sfxlo-NotebookbarToolBox" id="ExtBottom8">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="halign">end</property>
@@ -4222,10 +4225,21 @@
                                     <property name="toolbar_style">icons</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="Default-InsertDraw">
+                                      <object class="GtkMenuToolButton" id="Default-LineSpacing">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:InsertDraw</property>
+                                        <property name="action_name">.uno:LineSpacing</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="homogeneous">True</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkMenuToolButton" id="Default-BackgroundColor">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="action_name">.uno:BackgroundColor</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -4254,7 +4268,7 @@
                           </packing>
                         </child>
                         <style>
-                          <class name="priority-5"/>
+                          <class name="priority-6"/>
                         </style>
                       </object>
                       <packing>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
index b82b824e23bb..e2a2dd2f01af 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
@@ -2755,7 +2755,7 @@
       <object class="GtkMenuItem" id="MenuStyles-TextBody">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:StyleApply?Style:string=Text body&amp;FamilyName:string=ParagraphStyles</property>
+        <property name="action_name">.uno:TextBodyParaStyle</property>
       </object>
     </child>
     <child>
@@ -2768,42 +2768,42 @@
       <object class="GtkMenuItem" id="MenuStyles-Title">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:StyleApply?Style:string=Title&amp;FamilyName:string=ParagraphStyles</property>
+        <property name="action_name">.uno:TitleParaStyle</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuStyles-Subtitle">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:StyleApply?Style:string=Subtitle&amp;FamilyName:string=ParagraphStyles</property>
+        <property name="action_name">.uno:SubtitleParaStyle</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuStyles-Heading1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:StyleApply?Style:string=Heading 1&amp;FamilyName:string=ParagraphStyles</property>
+        <property name="action_name">.uno:Heading1ParaStyle</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuStyles-Heading2">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:StyleApply?Style:string=Heading 2&amp;FamilyName:string=ParagraphStyles</property>
+        <property name="action_name">.uno:Heading2ParaStyle</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuStyles-Heading3">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:StyleApply?Style:string=Heading 3&amp;FamilyName:string=ParagraphStyles</property>
+        <property name="action_name">.uno:Heading3ParaStyle</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuStyles-Heading4">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:StyleApply?Style:string=Heading 4&amp;FamilyName:string=ParagraphStyles</property>
+        <property name="action_name">.uno:Heading4ParaStyle</property>
       </object>
     </child>
     <child>
@@ -2816,35 +2816,35 @@
       <object class="GtkMenuItem" id="MenuStyles-DefaultStyle">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:StyleApply?Style:string=Standard&amp;FamilyName:string=CharacterStyles</property>
+        <property name="action_name">.uno:DefaultCharStyle</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuStyles-Emphasis">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:StyleApply?Style:string=Emphasis&amp;FamilyName:string=CharacterStyles</property>
+        <property name="action_name">.uno:EmphasisCharStyle</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuStyles-EmphasisStrong">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:StyleApply?Style:string=Strong Emphasis&amp;FamilyName:string=CharacterStyles</property>
+        <property name="action_name">.uno:StrongEmphasisCharStyle</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuStyles-Citation">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:StyleApply?Style:string=Citation&amp;FamilyName:string=CharacterStyles</property>
+        <property name="action_name">.uno:QuoteCharStyle</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuStyles-SourceCode">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:StyleApply?Style:string=Source Text&amp;FamilyName:string=CharacterStyles</property>
+        <property name="action_name">.uno:SourceCharStyle</property>
       </object>
     </child>
     <child>
@@ -2857,28 +2857,42 @@
       <object class="GtkMenuItem" id="MenuStyles-ListStyle">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:StyleApply?Style:string=List 1&amp;FamilyName:string=NumberingStyles</property>
+        <property name="action_name">.uno:BulletListStyle</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MenuStyles-Numbering_123">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:StyleApply?Style:string=Numbering 123&amp;FamilyName:string=NumberingStyles</property>
+        <property name="action_name">.uno:NumberListStyle</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuStyles-Numbering_abc">
+      <object class="GtkMenuItem" id="MenuStyles-AlphaListStyle">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:StyleApply?Style:string=Numbering abc&amp;FamilyName:string=NumberingStyles</property>
+        <property name="action_name">.uno:AlphaListStyle</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuStyles-Numbering_IVX">
+      <object class="GtkMenuItem" id="MenuStyles-AlphaLowListStyle">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:StyleApply?Style:string=Numbering IVX&amp;FamilyName:string=NumberingStyles</property>
+        <property name="action_name">.uno:AlphaLowListStyle</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuStyles-RomanListStyle">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:RomanListStyle</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuStyles-RomanLowListStyle">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:RomanLowListStyle</property>
       </object>
     </child>
     <child>