diff --git a/sw/uiconfig/swriter/ui/converttexttable.ui b/sw/uiconfig/swriter/ui/converttexttable.ui
index 8426f7c4e62b..f4bca7d6bc47 100644
--- a/sw/uiconfig/swriter/ui/converttexttable.ui
+++ b/sw/uiconfig/swriter/ui/converttexttable.ui
@@ -10,13 +10,13 @@
   </object>
   <object class="GtkDialog" id="ConvertTextTableDialog">
     <property name="can_focus">False</property>
-    <property name="border_width">5</property>
+    <property name="border_width">6</property>
     <property name="title" translatable="yes">Convert Table to Text</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="can_focus">False</property>
-        <property name="spacing">2</property>
+        <property name="spacing">12</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="dialog-action_area1">
             <property name="can_focus">False</property>
@@ -78,6 +78,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
+            <property name="spacing">12</property>
             <child>
               <object class="GtkFrame" id="frame1">
                 <property name="visible">True</property>
@@ -90,6 +91,7 @@
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
                     <property name="valign">start</property>
+                    <property name="top_padding">6</property>
                     <property name="left_padding">12</property>
                     <child>
                       <object class="GtkGrid" id="grid1">
@@ -97,9 +99,8 @@
                         <property name="can_focus">False</property>
                         <property name="halign">start</property>
                         <property name="valign">start</property>
-                        <property name="margin_bottom">10</property>
-                        <property name="row_spacing">18</property>
-                        <property name="column_spacing">10</property>
+                        <property name="row_spacing">12</property>
+                        <property name="column_spacing">12</property>
                         <child>
                           <object class="GtkEntry" id="othered">
                             <property name="visible">True</property>
@@ -249,13 +250,14 @@
                   <object class="GtkAlignment" id="alignment2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="top_padding">6</property>
                     <property name="left_padding">12</property>
                     <child>
                       <object class="GtkGrid" id="grid3">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="row_spacing">5</property>
-                        <property name="column_spacing">5</property>
+                        <property name="row_spacing">6</property>
+                        <property name="column_spacing">12</property>
                         <child>
                           <object class="GtkCheckButton" id="headingcb">
                             <property name="label" translatable="yes">Heading</property>
@@ -278,7 +280,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
-                            <property name="margin_left">25</property>
+                            <property name="margin_left">12</property>
                             <property name="xalign">0</property>
                             <property name="active">True</property>
                             <property name="draw_indicator">True</property>
@@ -328,7 +330,8 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="halign">start</property>
-                            <property name="margin_left">50</property>
+                            <property name="margin_left">24</property>
+                            <property name="column_spacing">12</property>
                             <child>
                               <object class="GtkLabel" id="label3">
                                 <property name="visible">True</property>
@@ -401,7 +404,7 @@
                   </object>
                 </child>
                 <child type="label">
-                  <object class="GtkLabel" id="2">
+                  <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="label" translatable="yes">Options</property>
diff --git a/sw/uiconfig/swriter/ui/indexentry.ui b/sw/uiconfig/swriter/ui/indexentry.ui
index 69a91e20509a..37e4e0b86a89 100644
--- a/sw/uiconfig/swriter/ui/indexentry.ui
+++ b/sw/uiconfig/swriter/ui/indexentry.ui
@@ -8,22 +8,6 @@
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
-  <object class="GtkImage" id="image1">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="halign">start</property>
-    <property name="stock">gtk-index</property>
-  </object>
-  <object class="GtkImage" id="image2">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-go-back</property>
-  </object>
-  <object class="GtkImage" id="image3">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-go-forward</property>
-  </object>
   <object class="GtkImage" id="image4">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -36,13 +20,13 @@
   </object>
   <object class="GtkDialog" id="IndexEntryDialog">
     <property name="can_focus">False</property>
-    <property name="border_width">5</property>
+    <property name="border_width">6</property>
     <property name="title" translatable="yes">Insert Index Entry</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="can_focus">False</property>
-        <property name="spacing">2</property>
+        <property name="spacing">12</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="dialog-action_area1">
             <property name="can_focus">False</property>
@@ -51,13 +35,11 @@
             <child>
               <object class="GtkButton" id="insert">
                 <property name="label" translatable="yes">Insert</property>
-                <property name="use_action_appearance">False</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="has_default">True</property>
                 <property name="receives_default">True</property>
                 <property name="no_show_all">True</property>
-                <property name="use_action_appearance">False</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -68,13 +50,11 @@
             <child>
               <object class="GtkButton" id="ok">
                 <property name="label">gtk-ok</property>
-                <property name="use_action_appearance">False</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="has_default">True</property>
                 <property name="receives_default">True</property>
                 <property name="no_show_all">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -86,11 +66,9 @@
             <child>
               <object class="GtkButton" id="close">
                 <property name="label">gtk-close</property>
-                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -102,11 +80,9 @@
             <child>
               <object class="GtkButton" id="help">
                 <property name="label">gtk-help</property>
-                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -118,11 +94,9 @@
             <child>
               <object class="GtkButton" id="delete">
                 <property name="label">gtk-delete</property>
-                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -142,13 +116,11 @@
                 <property name="column_homogeneous">True</property>
                 <child>
                   <object class="GtkButton" id="previous">
-                    <property name="use_action_appearance">False</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="no_show_all">True</property>
                     <property name="halign">center</property>
                     <property name="valign">center</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="image">image2</property>
                   </object>
                   <packing>
@@ -160,13 +132,11 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="next">
-                    <property name="use_action_appearance">False</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="no_show_all">True</property>
                     <property name="halign">center</property>
                     <property name="valign">center</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="image">image3</property>
                   </object>
                   <packing>
@@ -178,13 +148,11 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="first">
-                    <property name="use_action_appearance">False</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="no_show_all">True</property>
                     <property name="halign">center</property>
                     <property name="valign">center</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="image">image4</property>
                   </object>
                   <packing>
@@ -196,13 +164,11 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="last">
-                    <property name="use_action_appearance">False</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="no_show_all">True</property>
                     <property name="halign">center</property>
                     <property name="valign">center</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="image">image5</property>
                   </object>
                   <packing>
@@ -238,6 +204,7 @@
               <object class="GtkAlignment" id="alignment1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="top_padding">6</property>
                 <property name="left_padding">12</property>
                 <child>
                   <object class="GtkGrid" id="grid1">
@@ -250,9 +217,11 @@
                       <object class="GtkLabel" id="typeft">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="margin_right">12</property>
+                        <property name="margin_right">6</property>
                         <property name="xalign">0</property>
                         <property name="label" translatable="yes">Index</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">typecb</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -276,12 +245,10 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="new">
-                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="tooltip_text" translatable="yes">New User-defined Index</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="image">image1</property>
                       </object>
                       <packing>
@@ -295,9 +262,11 @@
                       <object class="GtkLabel" id="label3">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="margin_right">12</property>
+                        <property name="margin_right">6</property>
                         <property name="xalign">0</property>
                         <property name="label" translatable="yes">Entry</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">entryed</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -324,9 +293,11 @@
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
                         <property name="can_focus">False</property>
-                        <property name="margin_right">12</property>
+                        <property name="margin_right">6</property>
                         <property name="xalign">0</property>
                         <property name="label" translatable="yes">1st key</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">key1cb</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -340,9 +311,11 @@
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
                         <property name="can_focus">False</property>
-                        <property name="margin_right">12</property>
+                        <property name="margin_right">6</property>
                         <property name="xalign">0</property>
                         <property name="label" translatable="yes">2nd key</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">key2cb</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -355,9 +328,11 @@
                       <object class="GtkLabel" id="levelft">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="margin_right">12</property>
+                        <property name="margin_right">6</property>
                         <property name="xalign">0</property>
                         <property name="label" translatable="yes">Level</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">levelnf</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -384,11 +359,9 @@
                     <child>
                       <object class="GtkCheckButton" id="mainentrycb">
                         <property name="label" translatable="yes">Main entry</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                       </object>
@@ -402,11 +375,9 @@
                     <child>
                       <object class="GtkCheckButton" id="applytoallcb">
                         <property name="label" translatable="yes">Apply to all similar texts</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="no_show_all">True</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                       </object>
@@ -420,12 +391,10 @@
                     <child>
                       <object class="GtkCheckButton" id="searchcasesensitivecb">
                         <property name="label" translatable="yes">Match case</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="no_show_all">True</property>
                         <property name="margin_left">12</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                       </object>
@@ -439,12 +408,10 @@
                     <child>
                       <object class="GtkCheckButton" id="searchcasewordonlycb">
                         <property name="label" translatable="yes">Whole words only</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="no_show_all">True</property>
                         <property name="margin_left">12</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                       </object>
@@ -459,8 +426,12 @@
                       <object class="GtkLabel" id="phonetic0ft">
                         <property name="can_focus">False</property>
                         <property name="no_show_all">True</property>
-                        <property name="margin_right">12</property>
+                        <property name="margin_left">12</property>
+                        <property name="margin_right">6</property>
+                        <property name="xalign">0</property>
                         <property name="label" translatable="yes">Phonetic reading</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">phonetic0ed</property>
                       </object>
                       <packing>
                         <property name="left_attach">3</property>
@@ -473,8 +444,12 @@
                       <object class="GtkLabel" id="phonetic1ft">
                         <property name="can_focus">False</property>
                         <property name="no_show_all">True</property>
-                        <property name="margin_right">12</property>
+                        <property name="margin_left">12</property>
+                        <property name="margin_right">6</property>
+                        <property name="xalign">0</property>
                         <property name="label" translatable="yes">Phonetic reading</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">phonetic1ed</property>
                       </object>
                       <packing>
                         <property name="left_attach">3</property>
@@ -487,8 +462,12 @@
                       <object class="GtkLabel" id="phonetic2ft">
                         <property name="can_focus">False</property>
                         <property name="no_show_all">True</property>
-                        <property name="margin_right">12</property>
+                        <property name="margin_left">12</property>
+                        <property name="margin_right">6</property>
+                        <property name="xalign">0</property>
                         <property name="label" translatable="yes">Phonetic reading</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">phonetic2ed</property>
                       </object>
                       <packing>
                         <property name="left_attach">3</property>
@@ -648,4 +627,20 @@
       <action-widget response="0">delete</action-widget>
     </action-widgets>
   </object>
+  <object class="GtkImage" id="image1">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="halign">start</property>
+    <property name="stock">gtk-index</property>
+  </object>
+  <object class="GtkImage" id="image2">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-go-back</property>
+  </object>
+  <object class="GtkImage" id="image3">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-go-forward</property>
+  </object>
 </interface>
diff --git a/sw/uiconfig/swriter/ui/insertfootnote.ui b/sw/uiconfig/swriter/ui/insertfootnote.ui
index 64a787f3c4c3..e23e9afef821 100644
--- a/sw/uiconfig/swriter/ui/insertfootnote.ui
+++ b/sw/uiconfig/swriter/ui/insertfootnote.ui
@@ -3,13 +3,13 @@
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkDialog" id="InsertFootnoteDialog">
     <property name="can_focus">False</property>
-    <property name="border_width">5</property>
+    <property name="border_width">6</property>
     <property name="title" translatable="yes">Insert Footnote/Endnote</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="can_focus">False</property>
-        <property name="spacing">2</property>
+        <property name="spacing">12</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="dialog-action_area1">
             <property name="can_focus">False</property>
@@ -112,6 +112,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
+            <property name="spacing">12</property>
             <child>
               <object class="GtkFrame" id="numberingframe">
                 <property name="visible">True</property>
@@ -122,12 +123,14 @@
                   <object class="GtkAlignment" id="alignment1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="top_padding">6</property>
                     <property name="left_padding">12</property>
                     <child>
                       <object class="GtkGrid" id="grid1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="halign">start</property>
+                        <property name="row_spacing">6</property>
                         <property name="column_spacing">12</property>
                         <child>
                           <object class="GtkRadioButton" id="automatic">
@@ -244,12 +247,14 @@
                   <object class="GtkAlignment" id="alignment2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="top_padding">6</property>
                     <property name="left_padding">12</property>
                     <child>
                       <object class="GtkBox" id="box2">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="orientation">vertical</property>
+                        <property name="spacing">6</property>
                         <child>
                           <object class="GtkRadioButton" id="footnote">
                             <property name="label" translatable="yes">Footnote</property>
diff --git a/sw/uiconfig/swriter/ui/tableproperties.ui b/sw/uiconfig/swriter/ui/tableproperties.ui
index 236bfcc08a3c..7349208006a3 100644
--- a/sw/uiconfig/swriter/ui/tableproperties.ui
+++ b/sw/uiconfig/swriter/ui/tableproperties.ui
@@ -3,14 +3,14 @@
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkDialog" id="TablePropertiesDialog">
     <property name="can_focus">False</property>
-    <property name="border_width">5</property>
+    <property name="border_width">6</property>
     <property name="title" translatable="yes">Table Format</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
-        <property name="spacing">2</property>
+        <property name="spacing">12</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="dialog-action_area1">
             <property name="can_focus">False</property>