diff --git a/svx/uiconfig/ui/sidebarparagraph.ui b/svx/uiconfig/ui/sidebarparagraph.ui
index fa9e981c93d7..05a51c5e1c3b 100644
--- a/svx/uiconfig/ui/sidebarparagraph.ui
+++ b/svx/uiconfig/ui/sidebarparagraph.ui
@@ -93,7 +93,7 @@
                 <property name="show-arrow">False</property>
                 <property name="icon_size">2</property>
                 <child>
-                  <object class="GtkToolButton" id=".uno:LeftPara">
+                  <object class="GtkToolButton" id=".uno:StartPara">
                     <property name="visible">True</property>
                     <property name="use-underline">True</property>
                   </object>
@@ -113,7 +113,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkToolButton" id=".uno:RightPara">
+                  <object class="GtkToolButton" id=".uno:EndPara">
                     <property name="visible">True</property>
                     <property name="use-underline">True</property>
                   </object>
diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml b/sw/uiconfig/sglobal/menubar/menubar.xml
index 5c248926cf4f..d8cd4226a3a1 100644
--- a/sw/uiconfig/sglobal/menubar/menubar.xml
+++ b/sw/uiconfig/sglobal/menubar/menubar.xml
@@ -403,11 +403,14 @@
       </menu:menu>
       <menu:menu menu:id=".uno:TextAlign">
         <menu:menupopup>
-          <menu:menuitem menu:id=".uno:CommonAlignLeft" menu:style="radio"/>
+          <menu:menuitem menu:id=".uno:CommonAlignStart" menu:style="radio"/>
           <menu:menuitem menu:id=".uno:CommonAlignHorizontalCenter" menu:style="radio"/>
-          <menu:menuitem menu:id=".uno:CommonAlignRight" menu:style="radio"/>
+          <menu:menuitem menu:id=".uno:CommonAlignEnd" menu:style="radio"/>
           <menu:menuitem menu:id=".uno:CommonAlignJustified" menu:style="radio"/>
           <menu:menuseparator/>
+          <menu:menuitem menu:id=".uno:CommonAlignLeft" menu:style="radio"/>
+          <menu:menuitem menu:id=".uno:CommonAlignRight" menu:style="radio"/>
+          <menu:menuseparator/>
           <menu:menuitem menu:id=".uno:CommonAlignTop" menu:style="radio"/>
           <menu:menuitem menu:id=".uno:CommonAlignVerticalCenter" menu:style="radio"/>
           <menu:menuitem menu:id=".uno:CommonAlignBottom" menu:style="radio"/>
diff --git a/sw/uiconfig/sglobal/popupmenu/formrichtext.xml b/sw/uiconfig/sglobal/popupmenu/formrichtext.xml
index f5f8f7a0d209..e29b92d4f27c 100644
--- a/sw/uiconfig/sglobal/popupmenu/formrichtext.xml
+++ b/sw/uiconfig/sglobal/popupmenu/formrichtext.xml
@@ -30,9 +30,9 @@
   </menu:menu>
   <menu:menu menu:id=".uno:TextAlign">
     <menu:menupopup>
-      <menu:menuitem menu:id=".uno:LeftPara" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:StartPara" menu:style="radio"/>
       <menu:menuitem menu:id=".uno:CenterPara" menu:style="radio"/>
-      <menu:menuitem menu:id=".uno:RightPara" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:EndPara" menu:style="radio"/>
       <menu:menuitem menu:id=".uno:JustifyPara" menu:style="radio"/>
     </menu:menupopup>
   </menu:menu>
diff --git a/sw/uiconfig/sglobal/toolbar/drawtextobjectbar.xml b/sw/uiconfig/sglobal/toolbar/drawtextobjectbar.xml
index 42eb77d2b8dc..fc0efa775fec 100644
--- a/sw/uiconfig/sglobal/toolbar/drawtextobjectbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/drawtextobjectbar.xml
@@ -45,9 +45,9 @@
  <toolbar:toolbaritem xlink:href=".uno:Color"/>
  <toolbar:toolbaritem xlink:href=".uno:CharBackColor"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LeftPara"/>
+ <toolbar:toolbaritem xlink:href=".uno:StartPara"/>
  <toolbar:toolbaritem xlink:href=".uno:CenterPara"/>
- <toolbar:toolbaritem xlink:href=".uno:RightPara"/>
+ <toolbar:toolbaritem xlink:href=".uno:EndPara"/>
  <toolbar:toolbaritem xlink:href=".uno:JustifyPara"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:CellVertTop"/>
diff --git a/sw/uiconfig/sglobal/toolbar/formtextobjectbar.xml b/sw/uiconfig/sglobal/toolbar/formtextobjectbar.xml
index a055cba036b9..1d4ebcd20ca9 100644
--- a/sw/uiconfig/sglobal/toolbar/formtextobjectbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/formtextobjectbar.xml
@@ -28,9 +28,9 @@
  <toolbar:toolbaritem xlink:href=".uno:SuperScript"/>
  <toolbar:toolbaritem xlink:href=".uno:SubScript"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LeftPara"/>
+ <toolbar:toolbaritem xlink:href=".uno:StartPara"/>
  <toolbar:toolbaritem xlink:href=".uno:CenterPara"/>
- <toolbar:toolbaritem xlink:href=".uno:RightPara"/>
+ <toolbar:toolbaritem xlink:href=".uno:EndPara"/>
  <toolbar:toolbaritem xlink:href=".uno:JustifyPara"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:ParaLeftToRight"/>
@@ -42,4 +42,4 @@
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:FontDialog"/>
  <toolbar:toolbaritem xlink:href=".uno:ParagraphDialog"/>
-</toolbar:toolbar>
\ No newline at end of file
+</toolbar:toolbar>
diff --git a/sw/uiconfig/sglobal/toolbar/textstylebar.xml b/sw/uiconfig/sglobal/toolbar/textstylebar.xml
index 1c6b8667a3ae..5736e6bb315f 100644
--- a/sw/uiconfig/sglobal/toolbar/textstylebar.xml
+++ b/sw/uiconfig/sglobal/toolbar/textstylebar.xml
@@ -73,9 +73,9 @@
  <!-- These command can be enabled when tdf#107000 is fixed -->
  <toolbar:toolbaritem xlink:href=".uno:StyleApply" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LeftPara"/>
+ <toolbar:toolbaritem xlink:href=".uno:StartPara"/>
  <toolbar:toolbaritem xlink:href=".uno:CenterPara"/>
- <toolbar:toolbaritem xlink:href=".uno:RightPara"/>
+ <toolbar:toolbaritem xlink:href=".uno:EndPara"/>
  <toolbar:toolbaritem xlink:href=".uno:JustifyPara"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:BulletListStyle"/>
diff --git a/sw/uiconfig/sweb/menubar/menubar.xml b/sw/uiconfig/sweb/menubar/menubar.xml
index f2febf5e6127..ad0d973e896e 100644
--- a/sw/uiconfig/sweb/menubar/menubar.xml
+++ b/sw/uiconfig/sweb/menubar/menubar.xml
@@ -274,11 +274,14 @@
       </menu:menu>
       <menu:menu menu:id=".uno:TextAlign">
         <menu:menupopup>
-          <menu:menuitem menu:id=".uno:CommonAlignLeft" menu:style="radio"/>
+          <menu:menuitem menu:id=".uno:CommonAlignStart" menu:style="radio"/>
           <menu:menuitem menu:id=".uno:CommonAlignHorizontalCenter" menu:style="radio"/>
-          <menu:menuitem menu:id=".uno:CommonAlignRight" menu:style="radio"/>
+          <menu:menuitem menu:id=".uno:CommonAlignEnd" menu:style="radio"/>
           <menu:menuitem menu:id=".uno:CommonAlignJustified" menu:style="radio"/>
           <menu:menuseparator/>
+          <menu:menuitem menu:id=".uno:CommonAlignLeft" menu:style="radio"/>
+          <menu:menuitem menu:id=".uno:CommonAlignRight" menu:style="radio"/>
+          <menu:menuseparator/>
           <menu:menuitem menu:id=".uno:CommonAlignTop" menu:style="radio"/>
           <menu:menuitem menu:id=".uno:CommonAlignVerticalCenter" menu:style="radio"/>
           <menu:menuitem menu:id=".uno:CommonAlignBottom" menu:style="radio"/>
diff --git a/sw/uiconfig/sweb/popupmenu/formrichtext.xml b/sw/uiconfig/sweb/popupmenu/formrichtext.xml
index f5f8f7a0d209..e29b92d4f27c 100644
--- a/sw/uiconfig/sweb/popupmenu/formrichtext.xml
+++ b/sw/uiconfig/sweb/popupmenu/formrichtext.xml
@@ -30,9 +30,9 @@
   </menu:menu>
   <menu:menu menu:id=".uno:TextAlign">
     <menu:menupopup>
-      <menu:menuitem menu:id=".uno:LeftPara" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:StartPara" menu:style="radio"/>
       <menu:menuitem menu:id=".uno:CenterPara" menu:style="radio"/>
-      <menu:menuitem menu:id=".uno:RightPara" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:EndPara" menu:style="radio"/>
       <menu:menuitem menu:id=".uno:JustifyPara" menu:style="radio"/>
     </menu:menupopup>
   </menu:menu>
diff --git a/sw/uiconfig/sweb/toolbar/drawtextobjectbar.xml b/sw/uiconfig/sweb/toolbar/drawtextobjectbar.xml
index 42eb77d2b8dc..fc0efa775fec 100644
--- a/sw/uiconfig/sweb/toolbar/drawtextobjectbar.xml
+++ b/sw/uiconfig/sweb/toolbar/drawtextobjectbar.xml
@@ -45,9 +45,9 @@
  <toolbar:toolbaritem xlink:href=".uno:Color"/>
  <toolbar:toolbaritem xlink:href=".uno:CharBackColor"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LeftPara"/>
+ <toolbar:toolbaritem xlink:href=".uno:StartPara"/>
  <toolbar:toolbaritem xlink:href=".uno:CenterPara"/>
- <toolbar:toolbaritem xlink:href=".uno:RightPara"/>
+ <toolbar:toolbaritem xlink:href=".uno:EndPara"/>
  <toolbar:toolbaritem xlink:href=".uno:JustifyPara"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:CellVertTop"/>
diff --git a/sw/uiconfig/sweb/toolbar/formtextobjectbar.xml b/sw/uiconfig/sweb/toolbar/formtextobjectbar.xml
index a055cba036b9..1d4ebcd20ca9 100644
--- a/sw/uiconfig/sweb/toolbar/formtextobjectbar.xml
+++ b/sw/uiconfig/sweb/toolbar/formtextobjectbar.xml
@@ -28,9 +28,9 @@
  <toolbar:toolbaritem xlink:href=".uno:SuperScript"/>
  <toolbar:toolbaritem xlink:href=".uno:SubScript"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LeftPara"/>
+ <toolbar:toolbaritem xlink:href=".uno:StartPara"/>
  <toolbar:toolbaritem xlink:href=".uno:CenterPara"/>
- <toolbar:toolbaritem xlink:href=".uno:RightPara"/>
+ <toolbar:toolbaritem xlink:href=".uno:EndPara"/>
  <toolbar:toolbaritem xlink:href=".uno:JustifyPara"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:ParaLeftToRight"/>
@@ -42,4 +42,4 @@
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:FontDialog"/>
  <toolbar:toolbaritem xlink:href=".uno:ParagraphDialog"/>
-</toolbar:toolbar>
\ No newline at end of file
+</toolbar:toolbar>
diff --git a/sw/uiconfig/sweb/toolbar/textobjectbar.xml b/sw/uiconfig/sweb/toolbar/textobjectbar.xml
index c67af2b3fcee..53ec0ed84adf 100644
--- a/sw/uiconfig/sweb/toolbar/textobjectbar.xml
+++ b/sw/uiconfig/sweb/toolbar/textobjectbar.xml
@@ -53,9 +53,9 @@
  <toolbar:toolbaritem xlink:href=".uno:CharBackColor"/>
  <toolbar:toolbaritem xlink:href=".uno:BackgroundColor" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LeftPara"/>
+ <toolbar:toolbaritem xlink:href=".uno:StartPara"/>
  <toolbar:toolbaritem xlink:href=".uno:CenterPara"/>
- <toolbar:toolbaritem xlink:href=".uno:RightPara"/>
+ <toolbar:toolbaritem xlink:href=".uno:EndPara"/>
  <toolbar:toolbaritem xlink:href=".uno:JustifyPara"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:CellVertTop" toolbar:visible="false"/>
diff --git a/sw/uiconfig/swform/menubar/menubar.xml b/sw/uiconfig/swform/menubar/menubar.xml
index b76599cb2678..8ac876b1e24a 100644
--- a/sw/uiconfig/swform/menubar/menubar.xml
+++ b/sw/uiconfig/swform/menubar/menubar.xml
@@ -352,11 +352,14 @@
       </menu:menu>
       <menu:menu menu:id=".uno:TextAlign">
         <menu:menupopup>
-          <menu:menuitem menu:id=".uno:CommonAlignLeft" menu:style="radio"/>
+          <menu:menuitem menu:id=".uno:CommonAlignStart" menu:style="radio"/>
           <menu:menuitem menu:id=".uno:CommonAlignHorizontalCenter" menu:style="radio"/>
-          <menu:menuitem menu:id=".uno:CommonAlignRight" menu:style="radio"/>
+          <menu:menuitem menu:id=".uno:CommonAlignEnd" menu:style="radio"/>
           <menu:menuitem menu:id=".uno:CommonAlignJustified" menu:style="radio"/>
           <menu:menuseparator/>
+          <menu:menuitem menu:id=".uno:CommonAlignLeft" menu:style="radio"/>
+          <menu:menuitem menu:id=".uno:CommonAlignRight" menu:style="radio"/>
+          <menu:menuseparator/>
           <menu:menuitem menu:id=".uno:CommonAlignTop" menu:style="radio"/>
           <menu:menuitem menu:id=".uno:CommonAlignVerticalCenter" menu:style="radio"/>
           <menu:menuitem menu:id=".uno:CommonAlignBottom" menu:style="radio"/>
diff --git a/sw/uiconfig/swform/popupmenu/formrichtext.xml b/sw/uiconfig/swform/popupmenu/formrichtext.xml
index f5f8f7a0d209..e29b92d4f27c 100644
--- a/sw/uiconfig/swform/popupmenu/formrichtext.xml
+++ b/sw/uiconfig/swform/popupmenu/formrichtext.xml
@@ -30,9 +30,9 @@
   </menu:menu>
   <menu:menu menu:id=".uno:TextAlign">
     <menu:menupopup>
-      <menu:menuitem menu:id=".uno:LeftPara" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:StartPara" menu:style="radio"/>
       <menu:menuitem menu:id=".uno:CenterPara" menu:style="radio"/>
-      <menu:menuitem menu:id=".uno:RightPara" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:EndPara" menu:style="radio"/>
       <menu:menuitem menu:id=".uno:JustifyPara" menu:style="radio"/>
     </menu:menupopup>
   </menu:menu>
diff --git a/sw/uiconfig/swform/toolbar/drawtextobjectbar.xml b/sw/uiconfig/swform/toolbar/drawtextobjectbar.xml
index 42eb77d2b8dc..fc0efa775fec 100644
--- a/sw/uiconfig/swform/toolbar/drawtextobjectbar.xml
+++ b/sw/uiconfig/swform/toolbar/drawtextobjectbar.xml
@@ -45,9 +45,9 @@
  <toolbar:toolbaritem xlink:href=".uno:Color"/>
  <toolbar:toolbaritem xlink:href=".uno:CharBackColor"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LeftPara"/>
+ <toolbar:toolbaritem xlink:href=".uno:StartPara"/>
  <toolbar:toolbaritem xlink:href=".uno:CenterPara"/>
- <toolbar:toolbaritem xlink:href=".uno:RightPara"/>
+ <toolbar:toolbaritem xlink:href=".uno:EndPara"/>
  <toolbar:toolbaritem xlink:href=".uno:JustifyPara"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:CellVertTop"/>
diff --git a/sw/uiconfig/swform/toolbar/formtextobjectbar.xml b/sw/uiconfig/swform/toolbar/formtextobjectbar.xml
index a055cba036b9..1d4ebcd20ca9 100644
--- a/sw/uiconfig/swform/toolbar/formtextobjectbar.xml
+++ b/sw/uiconfig/swform/toolbar/formtextobjectbar.xml
@@ -28,9 +28,9 @@
  <toolbar:toolbaritem xlink:href=".uno:SuperScript"/>
  <toolbar:toolbaritem xlink:href=".uno:SubScript"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LeftPara"/>
+ <toolbar:toolbaritem xlink:href=".uno:StartPara"/>
  <toolbar:toolbaritem xlink:href=".uno:CenterPara"/>
- <toolbar:toolbaritem xlink:href=".uno:RightPara"/>
+ <toolbar:toolbaritem xlink:href=".uno:EndPara"/>
  <toolbar:toolbaritem xlink:href=".uno:JustifyPara"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:ParaLeftToRight"/>
@@ -42,4 +42,4 @@
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:FontDialog"/>
  <toolbar:toolbaritem xlink:href=".uno:ParagraphDialog"/>
-</toolbar:toolbar>
\ No newline at end of file
+</toolbar:toolbar>
diff --git a/sw/uiconfig/swform/toolbar/textobjectbar.xml b/sw/uiconfig/swform/toolbar/textobjectbar.xml
index c67af2b3fcee..53ec0ed84adf 100644
--- a/sw/uiconfig/swform/toolbar/textobjectbar.xml
+++ b/sw/uiconfig/swform/toolbar/textobjectbar.xml
@@ -53,9 +53,9 @@
  <toolbar:toolbaritem xlink:href=".uno:CharBackColor"/>
  <toolbar:toolbaritem xlink:href=".uno:BackgroundColor" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LeftPara"/>
+ <toolbar:toolbaritem xlink:href=".uno:StartPara"/>
  <toolbar:toolbaritem xlink:href=".uno:CenterPara"/>
- <toolbar:toolbaritem xlink:href=".uno:RightPara"/>
+ <toolbar:toolbaritem xlink:href=".uno:EndPara"/>
  <toolbar:toolbaritem xlink:href=".uno:JustifyPara"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:CellVertTop" toolbar:visible="false"/>
diff --git a/sw/uiconfig/swreport/menubar/menubar.xml b/sw/uiconfig/swreport/menubar/menubar.xml
index b5dcec6ece26..2296639f88b7 100644
--- a/sw/uiconfig/swreport/menubar/menubar.xml
+++ b/sw/uiconfig/swreport/menubar/menubar.xml
@@ -333,11 +333,14 @@
       </menu:menu>
       <menu:menu menu:id=".uno:TextAlign">
         <menu:menupopup>
-          <menu:menuitem menu:id=".uno:CommonAlignLeft" menu:style="radio"/>
+          <menu:menuitem menu:id=".uno:CommonAlignStart" menu:style="radio"/>
           <menu:menuitem menu:id=".uno:CommonAlignHorizontalCenter" menu:style="radio"/>
-          <menu:menuitem menu:id=".uno:CommonAlignRight" menu:style="radio"/>
+          <menu:menuitem menu:id=".uno:CommonAlignEnd" menu:style="radio"/>
           <menu:menuitem menu:id=".uno:CommonAlignJustified" menu:style="radio"/>
           <menu:menuseparator/>
+          <menu:menuitem menu:id=".uno:CommonAlignLeft" menu:style="radio"/>
+          <menu:menuitem menu:id=".uno:CommonAlignRight" menu:style="radio"/>
+          <menu:menuseparator/>
           <menu:menuitem menu:id=".uno:CommonAlignTop" menu:style="radio"/>
           <menu:menuitem menu:id=".uno:CommonAlignVerticalCenter" menu:style="radio"/>
           <menu:menuitem menu:id=".uno:CommonAlignBottom" menu:style="radio"/>
diff --git a/sw/uiconfig/swreport/popupmenu/formrichtext.xml b/sw/uiconfig/swreport/popupmenu/formrichtext.xml
index f5f8f7a0d209..e29b92d4f27c 100644
--- a/sw/uiconfig/swreport/popupmenu/formrichtext.xml
+++ b/sw/uiconfig/swreport/popupmenu/formrichtext.xml
@@ -30,9 +30,9 @@
   </menu:menu>
   <menu:menu menu:id=".uno:TextAlign">
     <menu:menupopup>
-      <menu:menuitem menu:id=".uno:LeftPara" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:StartPara" menu:style="radio"/>
       <menu:menuitem menu:id=".uno:CenterPara" menu:style="radio"/>
-      <menu:menuitem menu:id=".uno:RightPara" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:EndPara" menu:style="radio"/>
       <menu:menuitem menu:id=".uno:JustifyPara" menu:style="radio"/>
     </menu:menupopup>
   </menu:menu>
diff --git a/sw/uiconfig/swreport/toolbar/drawtextobjectbar.xml b/sw/uiconfig/swreport/toolbar/drawtextobjectbar.xml
index 42eb77d2b8dc..fc0efa775fec 100644
--- a/sw/uiconfig/swreport/toolbar/drawtextobjectbar.xml
+++ b/sw/uiconfig/swreport/toolbar/drawtextobjectbar.xml
@@ -45,9 +45,9 @@
  <toolbar:toolbaritem xlink:href=".uno:Color"/>
  <toolbar:toolbaritem xlink:href=".uno:CharBackColor"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LeftPara"/>
+ <toolbar:toolbaritem xlink:href=".uno:StartPara"/>
  <toolbar:toolbaritem xlink:href=".uno:CenterPara"/>
- <toolbar:toolbaritem xlink:href=".uno:RightPara"/>
+ <toolbar:toolbaritem xlink:href=".uno:EndPara"/>
  <toolbar:toolbaritem xlink:href=".uno:JustifyPara"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:CellVertTop"/>
diff --git a/sw/uiconfig/swreport/toolbar/formtextobjectbar.xml b/sw/uiconfig/swreport/toolbar/formtextobjectbar.xml
index a055cba036b9..1d4ebcd20ca9 100644
--- a/sw/uiconfig/swreport/toolbar/formtextobjectbar.xml
+++ b/sw/uiconfig/swreport/toolbar/formtextobjectbar.xml
@@ -28,9 +28,9 @@
  <toolbar:toolbaritem xlink:href=".uno:SuperScript"/>
  <toolbar:toolbaritem xlink:href=".uno:SubScript"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LeftPara"/>
+ <toolbar:toolbaritem xlink:href=".uno:StartPara"/>
  <toolbar:toolbaritem xlink:href=".uno:CenterPara"/>
- <toolbar:toolbaritem xlink:href=".uno:RightPara"/>
+ <toolbar:toolbaritem xlink:href=".uno:EndPara"/>
  <toolbar:toolbaritem xlink:href=".uno:JustifyPara"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:ParaLeftToRight"/>
@@ -42,4 +42,4 @@
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:FontDialog"/>
  <toolbar:toolbaritem xlink:href=".uno:ParagraphDialog"/>
-</toolbar:toolbar>
\ No newline at end of file
+</toolbar:toolbar>
diff --git a/sw/uiconfig/swreport/toolbar/textobjectbar.xml b/sw/uiconfig/swreport/toolbar/textobjectbar.xml
index c67af2b3fcee..53ec0ed84adf 100644
--- a/sw/uiconfig/swreport/toolbar/textobjectbar.xml
+++ b/sw/uiconfig/swreport/toolbar/textobjectbar.xml
@@ -53,9 +53,9 @@
  <toolbar:toolbaritem xlink:href=".uno:CharBackColor"/>
  <toolbar:toolbaritem xlink:href=".uno:BackgroundColor" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LeftPara"/>
+ <toolbar:toolbaritem xlink:href=".uno:StartPara"/>
  <toolbar:toolbaritem xlink:href=".uno:CenterPara"/>
- <toolbar:toolbaritem xlink:href=".uno:RightPara"/>
+ <toolbar:toolbaritem xlink:href=".uno:EndPara"/>
  <toolbar:toolbaritem xlink:href=".uno:JustifyPara"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:CellVertTop" toolbar:visible="false"/>
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml
index cc34835b73c4..98b9177a0728 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -422,11 +422,14 @@
       </menu:menu>
       <menu:menu menu:id=".uno:TextAlign">
         <menu:menupopup>
-          <menu:menuitem menu:id=".uno:CommonAlignLeft" menu:style="radio"/>
+          <menu:menuitem menu:id=".uno:CommonAlignStart" menu:style="radio"/>
           <menu:menuitem menu:id=".uno:CommonAlignHorizontalCenter" menu:style="radio"/>
-          <menu:menuitem menu:id=".uno:CommonAlignRight" menu:style="radio"/>
+          <menu:menuitem menu:id=".uno:CommonAlignEnd" menu:style="radio"/>
           <menu:menuitem menu:id=".uno:CommonAlignJustified" menu:style="radio"/>
           <menu:menuseparator/>
+          <menu:menuitem menu:id=".uno:CommonAlignLeft" menu:style="radio"/>
+          <menu:menuitem menu:id=".uno:CommonAlignRight" menu:style="radio"/>
+          <menu:menuseparator/>
           <menu:menuitem menu:id=".uno:CommonAlignTop" menu:style="radio"/>
           <menu:menuitem menu:id=".uno:CommonAlignVerticalCenter" menu:style="radio"/>
           <menu:menuitem menu:id=".uno:CommonAlignBottom" menu:style="radio"/>
diff --git a/sw/uiconfig/swriter/popupmenu/formrichtext.xml b/sw/uiconfig/swriter/popupmenu/formrichtext.xml
index f5f8f7a0d209..e29b92d4f27c 100644
--- a/sw/uiconfig/swriter/popupmenu/formrichtext.xml
+++ b/sw/uiconfig/swriter/popupmenu/formrichtext.xml
@@ -30,9 +30,9 @@
   </menu:menu>
   <menu:menu menu:id=".uno:TextAlign">
     <menu:menupopup>
-      <menu:menuitem menu:id=".uno:LeftPara" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:StartPara" menu:style="radio"/>
       <menu:menuitem menu:id=".uno:CenterPara" menu:style="radio"/>
-      <menu:menuitem menu:id=".uno:RightPara" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:EndPara" menu:style="radio"/>
       <menu:menuitem menu:id=".uno:JustifyPara" menu:style="radio"/>
     </menu:menupopup>
   </menu:menu>
diff --git a/sw/uiconfig/swriter/toolbar/drawtextobjectbar.xml b/sw/uiconfig/swriter/toolbar/drawtextobjectbar.xml
index 42eb77d2b8dc..fc0efa775fec 100644
--- a/sw/uiconfig/swriter/toolbar/drawtextobjectbar.xml
+++ b/sw/uiconfig/swriter/toolbar/drawtextobjectbar.xml
@@ -45,9 +45,9 @@
  <toolbar:toolbaritem xlink:href=".uno:Color"/>
  <toolbar:toolbaritem xlink:href=".uno:CharBackColor"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LeftPara"/>
+ <toolbar:toolbaritem xlink:href=".uno:StartPara"/>
  <toolbar:toolbaritem xlink:href=".uno:CenterPara"/>
- <toolbar:toolbaritem xlink:href=".uno:RightPara"/>
+ <toolbar:toolbaritem xlink:href=".uno:EndPara"/>
  <toolbar:toolbaritem xlink:href=".uno:JustifyPara"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:CellVertTop"/>
diff --git a/sw/uiconfig/swriter/toolbar/formtextobjectbar.xml b/sw/uiconfig/swriter/toolbar/formtextobjectbar.xml
index a055cba036b9..1d4ebcd20ca9 100644
--- a/sw/uiconfig/swriter/toolbar/formtextobjectbar.xml
+++ b/sw/uiconfig/swriter/toolbar/formtextobjectbar.xml
@@ -28,9 +28,9 @@
  <toolbar:toolbaritem xlink:href=".uno:SuperScript"/>
  <toolbar:toolbaritem xlink:href=".uno:SubScript"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LeftPara"/>
+ <toolbar:toolbaritem xlink:href=".uno:StartPara"/>
  <toolbar:toolbaritem xlink:href=".uno:CenterPara"/>
- <toolbar:toolbaritem xlink:href=".uno:RightPara"/>
+ <toolbar:toolbaritem xlink:href=".uno:EndPara"/>
  <toolbar:toolbaritem xlink:href=".uno:JustifyPara"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:ParaLeftToRight"/>
@@ -42,4 +42,4 @@
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:FontDialog"/>
  <toolbar:toolbaritem xlink:href=".uno:ParagraphDialog"/>
-</toolbar:toolbar>
\ No newline at end of file
+</toolbar:toolbar>
diff --git a/sw/uiconfig/swriter/toolbar/singlemode-drawtext.xml b/sw/uiconfig/swriter/toolbar/singlemode-drawtext.xml
index 405cd069345d..fad427fe948f 100644
--- a/sw/uiconfig/swriter/toolbar/singlemode-drawtext.xml
+++ b/sw/uiconfig/swriter/toolbar/singlemode-drawtext.xml
@@ -33,9 +33,9 @@
  <toolbar:toolbaritem xlink:href=".uno:CharBackColor"/>
  <toolbar:toolbaritem xlink:href=".uno:FontDialog-more"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LeftPara"/>
+ <toolbar:toolbaritem xlink:href=".uno:StartPara"/>
  <toolbar:toolbaritem xlink:href=".uno:CenterPara"/>
- <toolbar:toolbaritem xlink:href=".uno:RightPara"/>
+ <toolbar:toolbaritem xlink:href=".uno:EndPara"/>
  <toolbar:toolbaritem xlink:href=".uno:JustifyPara"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:ParaLeftToRight"/>
diff --git a/sw/uiconfig/swriter/toolbar/singlemode-table.xml b/sw/uiconfig/swriter/toolbar/singlemode-table.xml
index b8c41d75cc84..cf531014ed23 100644
--- a/sw/uiconfig/swriter/toolbar/singlemode-table.xml
+++ b/sw/uiconfig/swriter/toolbar/singlemode-table.xml
@@ -40,9 +40,9 @@
  <toolbar:toolbaritem xlink:href=".uno:IncrementIndent"/>
  <toolbar:toolbaritem xlink:href=".uno:DecrementIndent"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LeftPara"/>
+ <toolbar:toolbaritem xlink:href=".uno:StartPara"/>
  <toolbar:toolbaritem xlink:href=".uno:CenterPara"/>
- <toolbar:toolbaritem xlink:href=".uno:RightPara"/>
+ <toolbar:toolbaritem xlink:href=".uno:EndPara"/>
  <toolbar:toolbaritem xlink:href=".uno:JustifyPara"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:CommonAlignTop"/>
diff --git a/sw/uiconfig/swriter/toolbar/singlemode-text.xml b/sw/uiconfig/swriter/toolbar/singlemode-text.xml
index 99aac24f3ad1..6050fdde03e4 100644
--- a/sw/uiconfig/swriter/toolbar/singlemode-text.xml
+++ b/sw/uiconfig/swriter/toolbar/singlemode-text.xml
@@ -57,9 +57,9 @@
  <toolbar:toolbaritem xlink:href=".uno:IncrementSubLevels" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:DecrementSubLevels" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LeftPara"/>
+ <toolbar:toolbaritem xlink:href=".uno:StartPara"/>
  <toolbar:toolbaritem xlink:href=".uno:CenterPara"/>
- <toolbar:toolbaritem xlink:href=".uno:RightPara"/>
+ <toolbar:toolbaritem xlink:href=".uno:EndPara"/>
  <toolbar:toolbaritem xlink:href=".uno:JustifyPara"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:CommonAlignTop" toolbar:visible="false"/>
diff --git a/sw/uiconfig/swriter/toolbar/textobjectbar.xml b/sw/uiconfig/swriter/toolbar/textobjectbar.xml
index c67af2b3fcee..53ec0ed84adf 100644
--- a/sw/uiconfig/swriter/toolbar/textobjectbar.xml
+++ b/sw/uiconfig/swriter/toolbar/textobjectbar.xml
@@ -53,9 +53,9 @@
  <toolbar:toolbaritem xlink:href=".uno:CharBackColor"/>
  <toolbar:toolbaritem xlink:href=".uno:BackgroundColor" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LeftPara"/>
+ <toolbar:toolbaritem xlink:href=".uno:StartPara"/>
  <toolbar:toolbaritem xlink:href=".uno:CenterPara"/>
- <toolbar:toolbaritem xlink:href=".uno:RightPara"/>
+ <toolbar:toolbaritem xlink:href=".uno:EndPara"/>
  <toolbar:toolbaritem xlink:href=".uno:JustifyPara"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:CellVertTop" toolbar:visible="false"/>
diff --git a/sw/uiconfig/swriter/toolbar/textstylebar.xml b/sw/uiconfig/swriter/toolbar/textstylebar.xml
index 6bc8a084616a..95b0cc7034a8 100644
--- a/sw/uiconfig/swriter/toolbar/textstylebar.xml
+++ b/sw/uiconfig/swriter/toolbar/textstylebar.xml
@@ -73,9 +73,9 @@
  <!-- These command can be enabled when tdf#107000 is fixed -->
  <toolbar:toolbaritem xlink:href=".uno:StyleApply" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LeftPara" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:StartPara" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:CenterPara" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:RightPara" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:EndPara" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:JustifyPara" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:BulletListStyle"/>
diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui b/sw/uiconfig/swriter/ui/notebookbar.ui
index a699404e3226..478370bbc788 100644
--- a/sw/uiconfig/swriter/ui/notebookbar.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar.ui
@@ -3830,7 +3830,7 @@
                                         <property name="visible">True</property>
                                         <property name="halign">center</property>
                                         <property name="hexpand">True</property>
-                                        <property name="action-name">.uno:LeftPara</property>
+                                        <property name="action-name">.uno:StartPara</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -3854,7 +3854,7 @@
                                         <property name="visible">True</property>
                                         <property name="halign">center</property>
                                         <property name="hexpand">True</property>
-                                        <property name="action-name">.uno:RightPara</property>
+                                        <property name="action-name">.uno:EndPara</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -10512,7 +10512,7 @@
                                     <property name="visible">True</property>
                                     <property name="halign">center</property>
                                     <property name="hexpand">True</property>
-                                    <property name="action-name">.uno:LeftPara</property>
+                                    <property name="action-name">.uno:StartPara</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -10536,7 +10536,7 @@
                                     <property name="visible">True</property>
                                     <property name="halign">center</property>
                                     <property name="hexpand">True</property>
-                                    <property name="action-name">.uno:RightPara</property>
+                                    <property name="action-name">.uno:EndPara</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_compact.ui b/sw/uiconfig/swriter/ui/notebookbar_compact.ui
index 00f740f0f109..013aa0e88aff 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_compact.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_compact.ui
@@ -3948,7 +3948,7 @@
                                 <property name="visible">True</property>
                                 <property name="halign">center</property>
                                 <property name="hexpand">True</property>
-                                <property name="action_name">.uno:LeftPara</property>
+                                <property name="action_name">.uno:StartPara</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -3972,7 +3972,7 @@
                                 <property name="visible">True</property>
                                 <property name="halign">center</property>
                                 <property name="hexpand">True</property>
-                                <property name="action_name">.uno:RightPara</property>
+                                <property name="action_name">.uno:EndPara</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -9320,7 +9320,7 @@
                                 <property name="visible">True</property>
                                 <property name="halign">center</property>
                                 <property name="hexpand">True</property>
-                                <property name="action_name">.uno:LeftPara</property>
+                                <property name="action_name">.uno:StartPara</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -9373,7 +9373,7 @@
                                 <property name="visible">True</property>
                                 <property name="halign">center</property>
                                 <property name="hexpand">True</property>
-                                <property name="action_name">.uno:RightPara</property>
+                                <property name="action_name">.uno:EndPara</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
index 42d0dfb4fd38..e586b93960aa 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
@@ -4252,7 +4252,7 @@
                                     <child>
                                       <object class="GtkToolButton" id="Default-LeftPara">
                                         <property name="visible">True</property>
-                                        <property name="action_name">.uno:LeftPara</property>
+                                        <property name="action_name">.uno:StartPara</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -4272,7 +4272,7 @@
                                     <child>
                                       <object class="GtkToolButton" id="Default-RightPara">
                                         <property name="visible">True</property>
-                                        <property name="action_name">.uno:RightPara</property>
+                                        <property name="action_name">.uno:EndPara</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -5559,7 +5559,7 @@
                                     <child>
                                       <object class="GtkToolButton" id="Table-LeftPara">
                                         <property name="visible">True</property>
-                                        <property name="action_name">.uno:LeftPara</property>
+                                        <property name="action_name">.uno:StartPara</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -5579,7 +5579,7 @@
                                     <child>
                                       <object class="GtkToolButton" id="Table-RightPara">
                                         <property name="visible">True</property>
-                                        <property name="action_name">.uno:RightPara</property>
+                                        <property name="action_name">.uno:EndPara</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
index 07d5151d4316..769c9b33e9eb 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
@@ -4986,7 +4986,7 @@
                                         <child>
                                           <object class="GtkToolButton" id="LeftPara3">
                                             <property name="visible">True</property>
-                                            <property name="action_name">.uno:LeftPara</property>
+                                            <property name="action_name">.uno:StartPara</property>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
@@ -5006,7 +5006,7 @@
                                         <child>
                                           <object class="GtkToolButton" id="RightPara3">
                                             <property name="visible">True</property>
-                                            <property name="action_name">.uno:RightPara</property>
+                                            <property name="action_name">.uno:EndPara</property>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
@@ -6736,7 +6736,7 @@
                                         <child>
                                           <object class="GtkToolButton" id="LeftPara1">
                                             <property name="visible">True</property>
-                                            <property name="action_name">.uno:LeftPara</property>
+                                            <property name="action_name">.uno:StartPara</property>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
@@ -6756,7 +6756,7 @@
                                         <child>
                                           <object class="GtkToolButton" id="RightPara1">
                                             <property name="visible">True</property>
-                                            <property name="action_name">.uno:RightPara</property>
+                                            <property name="action_name">.uno:EndPara</property>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
@@ -9556,7 +9556,7 @@
                                     <child>
                                       <object class="GtkToolButton" id="LeftPara2">
                                         <property name="visible">True</property>
-                                        <property name="action_name">.uno:LeftPara</property>
+                                        <property name="action_name">.uno:StartPara</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -9576,7 +9576,7 @@
                                     <child>
                                       <object class="GtkToolButton" id="RightPara2">
                                         <property name="visible">True</property>
-                                        <property name="action_name">.uno:RightPara</property>
+                                        <property name="action_name">.uno:EndPara</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_groups.ui b/sw/uiconfig/swriter/ui/notebookbar_groups.ui
index 34abde1dfaf3..cfe60daf850f 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groups.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groups.ui
@@ -1151,7 +1151,7 @@
                         <property name="can_focus">True</property>
                         <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
-                        <property name="action_name">.uno:LeftPara</property>
+                        <property name="action_name">.uno:StartPara</property>
                         <property name="image">lefti</property>
                         <property name="relief">none</property>
                         <property name="xalign">0</property>
@@ -1189,7 +1189,7 @@
                         <property name="can_focus">True</property>
                         <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
-                        <property name="action_name">.uno:RightPara</property>
+                        <property name="action_name">.uno:EndPara</property>
                         <property name="image">righti</property>
                         <property name="relief">none</property>
                         <property name="xalign">0</property>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_single.ui b/sw/uiconfig/swriter/ui/notebookbar_single.ui
index fba575c249fd..24026aa0a44b 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_single.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_single.ui
@@ -973,7 +973,7 @@
                             <child>
                               <object class="GtkToolButton" id="Default-LeftPara">
                                 <property name="visible">True</property>
-                                <property name="action_name">.uno:LeftPara</property>
+                                <property name="action_name">.uno:StartPara</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -993,7 +993,7 @@
                             <child>
                               <object class="GtkToolButton" id="Default-RightPara">
                                 <property name="visible">True</property>
-                                <property name="action_name">.uno:RightPara</property>
+                                <property name="action_name">.uno:EndPara</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -2231,7 +2231,7 @@
                             <child>
                               <object class="GtkToolButton" id="Table-LeftPara1">
                                 <property name="visible">True</property>
-                                <property name="action_name">.uno:LeftPara</property>
+                                <property name="action_name">.uno:StartPara</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -2251,7 +2251,7 @@
                             <child>
                               <object class="GtkToolButton" id="Table-RightPara1">
                                 <property name="visible">True</property>
-                                <property name="action_name">.uno:RightPara</property>
+                                <property name="action_name">.uno:EndPara</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
diff --git a/sw/uiconfig/swxform/menubar/menubar.xml b/sw/uiconfig/swxform/menubar/menubar.xml
index 6dd99347197d..c004a9593410 100644
--- a/sw/uiconfig/swxform/menubar/menubar.xml
+++ b/sw/uiconfig/swxform/menubar/menubar.xml
@@ -398,11 +398,14 @@
       </menu:menu>
       <menu:menu menu:id=".uno:TextAlign">
         <menu:menupopup>
-          <menu:menuitem menu:id=".uno:CommonAlignLeft" menu:style="radio"/>
+          <menu:menuitem menu:id=".uno:CommonAlignStart" menu:style="radio"/>
           <menu:menuitem menu:id=".uno:CommonAlignHorizontalCenter" menu:style="radio"/>
-          <menu:menuitem menu:id=".uno:CommonAlignRight" menu:style="radio"/>
+          <menu:menuitem menu:id=".uno:CommonAlignEnd" menu:style="radio"/>
           <menu:menuitem menu:id=".uno:CommonAlignJustified" menu:style="radio"/>
           <menu:menuseparator/>
+          <menu:menuitem menu:id=".uno:CommonAlignLeft" menu:style="radio"/>
+          <menu:menuitem menu:id=".uno:CommonAlignRight" menu:style="radio"/>
+          <menu:menuseparator/>
           <menu:menuitem menu:id=".uno:CommonAlignTop" menu:style="radio"/>
           <menu:menuitem menu:id=".uno:CommonAlignVerticalCenter" menu:style="radio"/>
           <menu:menuitem menu:id=".uno:CommonAlignBottom" menu:style="radio"/>
diff --git a/sw/uiconfig/swxform/popupmenu/formrichtext.xml b/sw/uiconfig/swxform/popupmenu/formrichtext.xml
index f5f8f7a0d209..e29b92d4f27c 100644
--- a/sw/uiconfig/swxform/popupmenu/formrichtext.xml
+++ b/sw/uiconfig/swxform/popupmenu/formrichtext.xml
@@ -30,9 +30,9 @@
   </menu:menu>
   <menu:menu menu:id=".uno:TextAlign">
     <menu:menupopup>
-      <menu:menuitem menu:id=".uno:LeftPara" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:StartPara" menu:style="radio"/>
       <menu:menuitem menu:id=".uno:CenterPara" menu:style="radio"/>
-      <menu:menuitem menu:id=".uno:RightPara" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:EndPara" menu:style="radio"/>
       <menu:menuitem menu:id=".uno:JustifyPara" menu:style="radio"/>
     </menu:menupopup>
   </menu:menu>
diff --git a/sw/uiconfig/swxform/toolbar/drawtextobjectbar.xml b/sw/uiconfig/swxform/toolbar/drawtextobjectbar.xml
index 42eb77d2b8dc..fc0efa775fec 100644
--- a/sw/uiconfig/swxform/toolbar/drawtextobjectbar.xml
+++ b/sw/uiconfig/swxform/toolbar/drawtextobjectbar.xml
@@ -45,9 +45,9 @@
  <toolbar:toolbaritem xlink:href=".uno:Color"/>
  <toolbar:toolbaritem xlink:href=".uno:CharBackColor"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LeftPara"/>
+ <toolbar:toolbaritem xlink:href=".uno:StartPara"/>
  <toolbar:toolbaritem xlink:href=".uno:CenterPara"/>
- <toolbar:toolbaritem xlink:href=".uno:RightPara"/>
+ <toolbar:toolbaritem xlink:href=".uno:EndPara"/>
  <toolbar:toolbaritem xlink:href=".uno:JustifyPara"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:CellVertTop"/>
diff --git a/sw/uiconfig/swxform/toolbar/formtextobjectbar.xml b/sw/uiconfig/swxform/toolbar/formtextobjectbar.xml
index a055cba036b9..1d4ebcd20ca9 100644
--- a/sw/uiconfig/swxform/toolbar/formtextobjectbar.xml
+++ b/sw/uiconfig/swxform/toolbar/formtextobjectbar.xml
@@ -28,9 +28,9 @@
  <toolbar:toolbaritem xlink:href=".uno:SuperScript"/>
  <toolbar:toolbaritem xlink:href=".uno:SubScript"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LeftPara"/>
+ <toolbar:toolbaritem xlink:href=".uno:StartPara"/>
  <toolbar:toolbaritem xlink:href=".uno:CenterPara"/>
- <toolbar:toolbaritem xlink:href=".uno:RightPara"/>
+ <toolbar:toolbaritem xlink:href=".uno:EndPara"/>
  <toolbar:toolbaritem xlink:href=".uno:JustifyPara"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:ParaLeftToRight"/>
@@ -42,4 +42,4 @@
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:FontDialog"/>
  <toolbar:toolbaritem xlink:href=".uno:ParagraphDialog"/>
-</toolbar:toolbar>
\ No newline at end of file
+</toolbar:toolbar>
diff --git a/sw/uiconfig/swxform/toolbar/textobjectbar.xml b/sw/uiconfig/swxform/toolbar/textobjectbar.xml
index c67af2b3fcee..53ec0ed84adf 100644
--- a/sw/uiconfig/swxform/toolbar/textobjectbar.xml
+++ b/sw/uiconfig/swxform/toolbar/textobjectbar.xml
@@ -53,9 +53,9 @@
  <toolbar:toolbaritem xlink:href=".uno:CharBackColor"/>
  <toolbar:toolbaritem xlink:href=".uno:BackgroundColor" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LeftPara"/>
+ <toolbar:toolbaritem xlink:href=".uno:StartPara"/>
  <toolbar:toolbaritem xlink:href=".uno:CenterPara"/>
- <toolbar:toolbaritem xlink:href=".uno:RightPara"/>
+ <toolbar:toolbaritem xlink:href=".uno:EndPara"/>
  <toolbar:toolbaritem xlink:href=".uno:JustifyPara"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:CellVertTop" toolbar:visible="false"/>