Resolves tdf#145625 - Alignment issue at color options

* Label "On" cleared (kept internally for size calculation)
* Deprecated xalign removed
* margin-start set to 0, halign=start, valign=center for
color labels and checkboxes
* margin set to 12 at the right edge to have more space
for the scrollbar

Change-Id: I32b7c1fc4ad93b1e9fa7b78968eedbbc3580a379
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128322
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>

2 files changed, 107 insertions, 199 deletions

diff --git a/cui/uiconfig/ui/colorconfigwin.ui b/cui/uiconfig/ui/colorconfigwin.ui
index 2bde28f17598..73de1194964b 100644
--- a/cui/uiconfig/ui/colorconfigwin.ui
+++ b/cui/uiconfig/ui/colorconfigwin.ui
@@ -23,18 +23,18 @@
             <property name="visible">True</property>
             <property name="can-focus">False</property>
             <property name="margin-start">6</property>
-            <property name="margin-end">6</property>
+            <property name="margin-end">12</property>
             <property name="row-spacing">3</property>
             <property name="column-spacing">6</property>
             <child>
               <object class="GtkLabel" id="doccolor">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="margin-start">6</property>
+                <property name="halign">start</property>
+                <property name="valign">center</property>
                 <property name="label" translatable="yes" context="colorconfigwin|doccolor">Document background</property>
                 <property name="use-underline">True</property>
                 <property name="mnemonic-widget">doccolor_lb</property>
-                <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="left-attach">0</property>
@@ -48,9 +48,7 @@
                 <property name="receives-default">False</property>
                 <property name="halign">end</property>
                 <property name="hexpand">True</property>
-                <property name="xalign">0</property>
                 <property name="draw-indicator">True</property>
-                <property name="label" translatable="no"></property>
                 <child>
                   <placeholder/>
                 </child>
@@ -66,7 +64,8 @@
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="receives-default">False</property>
-                <property name="margin-start">6</property>
+                <property name="halign">start</property>
+                <property name="valign">center</property>
                 <property name="draw-indicator">True</property>
                 <accessibility>
                   <relation type="label-for" target="docboundaries_lb"/>
@@ -83,9 +82,7 @@
                 <property name="can-focus">True</property>
                 <property name="receives-default">False</property>
                 <property name="halign">end</property>
-                <property name="xalign">0</property>
                 <property name="draw-indicator">True</property>
-                <property name="label" translatable="no"></property>
                 <child>
                   <placeholder/>
                 </child>
@@ -107,11 +104,11 @@
               <object class="GtkLabel" id="appback">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="margin-start">6</property>
+                <property name="halign">start</property>
+                <property name="valign">center</property>
                 <property name="label" translatable="yes" context="colorconfigwin|appback">Application background</property>
                 <property name="use-underline">True</property>
                 <property name="mnemonic-widget">appback_lb</property>
-                <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="left-attach">0</property>
@@ -124,9 +121,7 @@
                 <property name="can-focus">True</property>
                 <property name="receives-default">False</property>
                 <property name="halign">end</property>
-                <property name="xalign">0</property>
                 <property name="draw-indicator">True</property>
-                <property name="label" translatable="no"></property>
                 <child>
                   <placeholder/>
                 </child>
@@ -142,7 +137,8 @@
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="receives-default">False</property>
-                <property name="margin-start">6</property>
+                <property name="halign">start</property>
+                <property name="valign">center</property>
                 <property name="draw-indicator">True</property>
                 <accessibility>
                   <relation type="label-for" target="objboundaries_lb"/>
@@ -159,9 +155,7 @@
                 <property name="can-focus">True</property>
                 <property name="receives-default">False</property>
                 <property name="halign">end</property>
-                <property name="xalign">0</property>
                 <property name="draw-indicator">True</property>
-                <property name="label" translatable="no"></property>
                 <child>
                   <placeholder/>
                 </child>
@@ -185,7 +179,8 @@
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="receives-default">False</property>
-                <property name="margin-start">6</property>
+                <property name="halign">start</property>
+                <property name="valign">center</property>
                 <property name="draw-indicator">True</property>
                 <accessibility>
                   <relation type="label-for" target="tblboundaries_lb"/>
@@ -202,9 +197,7 @@
                 <property name="can-focus">True</property>
                 <property name="receives-default">False</property>
                 <property name="halign">end</property>
-                <property name="xalign">0</property>
                 <property name="draw-indicator">True</property>
-                <property name="label" translatable="no"></property>
                 <child>
                   <placeholder/>
                 </child>
@@ -226,11 +219,11 @@
               <object class="GtkLabel" id="font">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="margin-start">6</property>
+                <property name="halign">start</property>
+                <property name="valign">center</property>
                 <property name="label" translatable="yes" context="colorconfigwin|font">Font color</property>
                 <property name="use-underline">True</property>
                 <property name="mnemonic-widget">font_lb</property>
-                <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="left-attach">0</property>
@@ -243,9 +236,7 @@
                 <property name="can-focus">True</property>
                 <property name="receives-default">False</property>
                 <property name="halign">end</property>
-                <property name="xalign">0</property>
                 <property name="draw-indicator">True</property>
-                <property name="label" translatable="no"></property>
                 <child>
                   <placeholder/>
                 </child>
@@ -261,7 +252,8 @@
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="receives-default">False</property>
-                <property name="margin-start">6</property>
+                <property name="halign">start</property>
+                <property name="valign">center</property>
                 <property name="draw-indicator">True</property>
                 <accessibility>
                   <relation type="label-for" target="unvisitedlinks_lb"/>
@@ -278,9 +270,7 @@
                 <property name="can-focus">True</property>
                 <property name="receives-default">False</property>
                 <property name="halign">end</property>
-                <property name="xalign">0</property>
                 <property name="draw-indicator">True</property>
-                <property name="label" translatable="no"></property>
                 <child>
                   <placeholder/>
                 </child>
@@ -304,7 +294,8 @@
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="receives-default">False</property>
-                <property name="margin-start">6</property>
+                <property name="halign">start</property>
+                <property name="valign">center</property>
                 <property name="draw-indicator">True</property>
                 <accessibility>
                   <relation type="label-for" target="visitedlinks_lb"/>
@@ -321,9 +312,7 @@
                 <property name="can-focus">True</property>
                 <property name="receives-default">False</property>
                 <property name="halign">end</property>
-                <property name="xalign">0</property>
                 <property name="draw-indicator">True</property>
-                <property name="label" translatable="no"></property>
                 <child>
                   <placeholder/>
                 </child>
@@ -345,11 +334,11 @@
               <object class="GtkLabel" id="autospellcheck">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="margin-start">6</property>
+                <property name="halign">start</property>
+                <property name="valign">center</property>
                 <property name="label" translatable="yes" context="colorconfigwin|autospellcheck">AutoSpellcheck</property>
                 <property name="use-underline">True</property>
                 <property name="mnemonic-widget">autospellcheck_lb</property>
-                <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="left-attach">0</property>
@@ -362,9 +351,7 @@
                 <property name="can-focus">True</property>
                 <property name="receives-default">False</property>
                 <property name="halign">end</property>
-                <property name="xalign">0</property>
                 <property name="draw-indicator">True</property>
-                <property name="label" translatable="no"></property>
                 <child>
                   <placeholder/>
                 </child>
@@ -378,11 +365,11 @@
               <object class="GtkLabel" id="smarttags">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="margin-start">6</property>
+                <property name="halign">start</property>
+                <property name="valign">center</property>
                 <property name="label" translatable="yes" context="colorconfigwin|smarttags">Smart Tags</property>
                 <property name="use-underline">True</property>
                 <property name="mnemonic-widget">smarttags_lb</property>
-                <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="left-attach">0</property>
@@ -395,9 +382,7 @@
                 <property name="can-focus">True</property>
                 <property name="receives-default">False</property>
                 <property name="halign">end</property>
-                <property name="xalign">0</property>
                 <property name="draw-indicator">True</property>
-                <property name="label" translatable="no"></property>
                 <child>
                   <placeholder/>
                 </child>
@@ -413,7 +398,8 @@
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="receives-default">False</property>
-                <property name="margin-start">6</property>
+                <property name="halign">start</property>
+                <property name="valign">center</property>
                 <property name="draw-indicator">True</property>
                 <accessibility>
                   <relation type="label-for" target="shadows_lb"/>
@@ -430,9 +416,7 @@
                 <property name="can-focus">True</property>
                 <property name="receives-default">False</property>
                 <property name="halign">end</property>
-                <property name="xalign">0</property>
                 <property name="draw-indicator">True</property>
-                <property name="label" translatable="no"></property>
                 <child>
                   <placeholder/>
                 </child>
@@ -481,18 +465,18 @@
             <property name="visible">True</property>
             <property name="can-focus">False</property>
             <property name="margin-start">6</property>
-            <property name="margin-end">6</property>
+            <property name="margin-end">12</property>
             <property name="row-spacing">3</property>
             <property name="column-spacing">6</property>
             <child>
               <object class="GtkLabel" id="writergrid">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="margin-start">6</property>
+                <property name="halign">start</property>
+                <property name="valign">center</property>
                 <property name="label" translatable="yes" context="colorconfigwin|writergrid">Grid</property>
                 <property name="use-underline">True</property>
                 <property name="mnemonic-widget">writergrid_lb</property>
-                <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="left-attach">0</property>
@@ -506,9 +490,7 @@
                 <property name="receives-default">False</property>
                 <property name="halign">end</property>
                 <property name="hexpand">True</property>
-                <property name="xalign">0</property>
                 <property name="draw-indicator">True</property>
-                <property name="label" translatable="no"></property>
                 <child>
                   <placeholder/>
                 </child>
@@ -524,7 +506,8 @@
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="receives-default">False</property>
-                <property name="margin-start">6</property>
+                <property name="halign">start</property>
+                <property name="valign">center</property>
                 <property name="draw-indicator">True</property>
                 <accessibility>
                   <relation type="label-for" target="field_lb"/>
@@ -541,9 +524,7 @@
                 <property name="can-focus">True</property>
                 <property name="receives-default">False</property>
                 <property name="halign">end</property>
-                <property name="xalign">0</property>
                 <property name="draw-indicator">True</property>
-                <property name="label" translatable="no"></property>
                 <child>
                   <placeholder/>
                 </child>
@@ -567,7 +548,8 @@
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="receives-default">False</property>
-                <property name="margin-start">6</property>
+                <property name="halign">start</property>
+                <property name="valign">center</property>
                 <property name="draw-indicator">True</property>
                 <accessibility>
                   <relation type="label-for" target="index_lb"/>
@@ -584,9 +566,7 @@
                 <property name="can-focus">True</property>
                 <property name="receives-default">False</property>
                 <property name="halign">end</property>
-                <property name="xalign">0</property>
                 <property name="draw-indicator">True</property>
-                <property name="label" translatable="no"></property>
                 <child>
                   <placeholder/>
                 </child>
@@ -608,11 +588,11 @@
               <object class="GtkLabel" id="script">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="margin-start">6</property>
+                <property name="halign">start</property>
+                <property name="valign">center</property>
                 <property name="label" translatable="yes" context="colorconfigwin|script">Script Indicator</property>
                 <property name="use-underline">True</property>
                 <property name="mnemonic-widget">script_lb</property>
-                <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="left-attach">0</property>
@@ -625,9 +605,7 @@
                 <property name="can-focus">True</property>
                 <property name="receives-default">False</property>
                 <property name="halign">end</property>
-                <property name="xalign">0</property>
                 <property name="draw-indicator">True</property>
-                <property name="label" translatable="no"></property>
                 <child>
                   <placeholder/>
                 </child>
@@ -643,7 +621,8 @@
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="receives-default">False</property>
-                <property name="margin-start">6</property>
+                <property name="halign">start</property>
+                <property name="valign">center</property>
                 <property name="draw-indicator">True</property>
                 <accessibility>
                   <relation type="label-for" target="section_lb"/>
@@ -660,9 +639,7 @@
                 <property name="can-focus">True</property>
                 <property name="receives-default">False</property>
                 <property name="halign">end</property>
-                <property name="xalign">0</property>
                 <property name="draw-indicator">True</property>
-                <property name="label" translatable="no"></property>
                 <child>
                   <placeholder/>
                 </child>
@@ -684,11 +661,11 @@
               <object class="GtkLabel" id="hdft">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="margin-start">6</property>
+                <property name="halign">start</property>
+                <property name="valign">center</property>
                 <property name="label" translatable="yes" context="colorconfigwin|hdft">Headers and Footer delimiter</property>
                 <property name="use-underline">True</property>
                 <property name="mnemonic-widget">hdft_lb</property>
-                <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="left-attach">0</property>
@@ -701,9 +678,7 @@
                 <property name="can-focus">True</property>
                 <property name="receives-default">False</property>
                 <property name="halign">end</property>
-                <property name="xalign">0</property>
                 <property name="draw-indicator">True</property>
-                <property name="label" translatable="no"></property>
                 <child>
                   <placeholder/>
                 </child>
@@ -717,11 +692,11 @@
               <object class="GtkLabel" id="pagebreak">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="margin-start">6</property>
+                <property name="halign">start</property>
+                <property name="valign">center</property>
                 <property name="label" translatable="yes" context="colorconfigwin|pagebreak">Page and column breaks</property>
                 <property name="use-underline">True</property>
                 <property name="mnemonic-widget">pagebreak_lb</property>
-                <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="left-attach">0</property>
@@ -734,9 +709,7 @@
                 <property name="can-focus">True</property>
                 <property name="receives-default">False</property>
                 <property name="halign">end</property>
-                <property name="xalign">0</property>
                 <property name="draw-indicator">True</property>
-                <property name="label" translatable="no"></property>
                 <child>
                   <placeholder/>
                 </child>
@@ -750,11 +723,11 @@
               <object class="GtkLabel" id="direct">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="margin-start">6</property>
+                <property name="halign">start</property>
+                <property name="valign">center</property>
                 <property name="label" translatable="yes" context="colorconfigwin|direct">Direct Cursor</property>
                 <property name="use-underline">True</property>
                 <property name="mnemonic-widget">direct_lb</property>
-                <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="left-attach">0</property>
@@ -767,9 +740,7 @@
                 <property name="can-focus">True</property>
                 <property name="receives-default">False</property>
                 <property name="halign">end</property>
-                <property name="xalign">0</property>
                 <property name="draw-indicator">True</property>
-                <property name="label" translatable="no"></property>
                 <child>
                   <placeholder/>
                 </child>
@@ -810,18 +781,18 @@
             <property name="visible">True</property>
             <property name="can-focus">False</property>
             <property name="margin-start">6</property>
-            <property name="margin-end">6</property>
+            <property name="margin-end">12</property>
             <property name="row-spacing">3</property>
             <property name="column-spacing">6</property>
             <child>
               <object class="GtkLabel" id="calcgrid">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="margin-start">6</property>
+                <property name="halign">start</property>
+                <property name="valign">center</property>
                 <property name="label" translatable="yes" context="colorconfigwin|calcgrid">Grid lines</property>
                 <property name="use-underline">True</property>
                 <property name="mnemonic-widget">calcgrid_lb</property>
-                <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="left-attach">0</property>
@@ -835,9 +806,7 @@
                 <property name="receives-default">False</property>
                 <property name="halign">end</property>
                 <property name="hexpand">True</property>
-                <property name="xalign">0</property>
                 <property name="draw-indicator">True</property>
-                <property name="label" translatable="no"></property>
                 <child>
                   <placeholder/>
                 </child>
@@ -851,11 +820,11 @@
               <object class="GtkLabel" id="brk">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="margin-start">6</property>
+                <property name="halign">start</property>
+                <property name="valign">center</property>
                 <property name="label" translatable="yes" context="colorconfigwin|brk">Page breaks</property>
                 <property name="use-underline">True</property>
                 <property name="mnemonic-widget">brk_lb</property>
-                <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="left-attach">0</property>
@@ -868,9 +837,7 @@
                 <property name="can-focus">True</property>
                 <property name="receives-default">False</property>
                 <property name="halign">end</property>
-                <property name="xalign">0</property>
                 <property name="draw-indicator">True</property>
-                <property name="label" translatable="no"></property>
                 <child>
                   <placeholder/>
                 </child>
@@ -884,11 +851,11 @@
               <object class="GtkLabel" id="brkmanual">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="margin-start">6</property>
+                <property name="halign">start</property>
+                <property name="valign">center</property>
                 <property name="label" translatable="yes" context="colorconfigwin|brkmanual">Manual page breaks</property>
                 <property name="use-underline">True</property>
                 <property name="mnemonic-widget">brkmanual_lb</property>
-                <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="left-attach">0</property>
@@ -901,9 +868,7 @@
                 <property name="can-focus">True</property>
                 <property name="receives-default">False</property>
                 <property name="halign">end</property>
-                <property name="xalign">0</property>
                 <property name="draw-indicator">True</property>
-                <property name="label" translatable="no"></property>
                 <child>
                   <placeholder/>
                 </child>
@@ -917,11 +882,11 @@
               <object class="GtkLabel" id="brkauto">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="margin-start">6</property>
+                <property name="halign">start</property>
+                <property name="valign">center</property>
                 <property name="label" translatable="yes" context="colorconfigwin|brkauto">Automatic page breaks</property>
                 <property name="use-underline">True</property>
                 <property name="mnemonic-widget">brkauto_lb</property>
-                <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="left-attach">0</property>
@@ -934,9 +899,7 @@
                 <property name="can-focus">True</property>
                 <property name="receives-default">False</property>
                 <property name="halign">end</property>
-                <property name="xalign">0</property>
                 <property name="draw-indicator">True</property>
-                <property name="label" translatable="no"></property>
                 <child>
                   <placeholder/>
                 </child>
@@ -950,11 +913,11 @@
               <object class="GtkLabel" id="det">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="margin-start">6</property>
+                <property name="halign">start</property>
+                <property name="valign">center</property>
                 <property name="label" translatable="yes" context="colorconfigwin|det">Detective</property>
                 <property name="use-underline">True</property>
                 <property name="mnemonic-widget">det_lb</property>
-                <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="left-attach">0</property>
@@ -967,9 +930,7 @@
                 <property name="can-focus">True</property>
                 <property name="receives-default">False</property>
                 <property name="halign">end</property>
-                <property name="xalign">0</property>
                 <property name="draw-indicator">True</property>
-                <property name="label" translatable="no"></property>
                 <child>
                   <placeholder/>
                 </child>
@@ -985,9 +946,7 @@
                 <property name="can-focus">True</property>
                 <property name="receives-default">False</property>
                 <property name="halign">end</property>
-                <property name="xalign">0</property>
                 <property name="draw-indicator">True</property>
-                <property name="label" translatable="no"></property>
                 <child>
                   <placeholder/>
                 </child>
@@ -1001,11 +960,11 @@
               <object class="GtkLabel" id="deterror">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="margin-start">6</property>
+                <property name="halign">start</property>
+                <property name="valign">center</property>
                 <property name="label" translatable="yes" context="colorconfigwin|deterror">Detective error</property>
                 <property name="use-underline">True</property>
                 <property name="mnemonic-widget">deterror_lb</property>
-                <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="left-attach">0</property>
@@ -1018,9 +977,7 @@
                 <property name="can-focus">True</property>
                 <property name="receives-default">False</property>
                 <property name="halign">end</property>
-                <property name="xalign">0</property>
                 <property name="draw-indicator">True</property>
-                <property name="label" translatable="no"></property>
                 <child>
                   <placeholder/>
                 </child>
@@ -1034,11 +991,11 @@
               <object class="GtkLabel" id="ref">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="margin-start">6</property>
+                <property name="halign">start</property>
+                <property name="valign">center</property>
                 <property name="label" translatable="yes" context="colorconfigwin|ref">References</property>
                 <property name="use-underline">True</property>
                 <property name="mnemonic-widget">ref_lb</property>
-                <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="left-attach">0</property>
@@ -1051,9 +1008,7 @@
                 <property name="can-focus">True</property>
                 <property name="receives-default">False</property>
                 <property name="halign">end</property>
-                <property name="xalign">0</property>
                 <property name="draw-indicator">True</property>
-                <property name="label" translatable="no"></property>
                 <child>
                   <placeholder/>
                 </child>
@@ -1067,11 +1022,11 @@
               <object class="GtkLabel" id="notes">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="margin-start">6</property>
+                <property name="halign">start</property>
+                <property name="valign">center</property>
                 <property name="label" translatable="yes" context="colorconfigwin|notes">Notes background</property>
                 <property name="use-underline">True</property>
                 <property name="mnemonic-widget">notes_lb</property>
-                <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="left-attach">0</property>
@@ -1084,9 +1039,7 @@
                 <property name="can-focus">True</property>
                 <property name="receives-default">False</property>
                 <property name="halign">end</property>
-                <property name="xalign">0</property>
                 <property name="draw-indicator">True</property>
-                <property name="label" translatable="no"></property>
                 <child>
                   <placeholder/>
                 </child>
@@ -1100,11 +1053,11 @@
               <object class="GtkLabel" id="values">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="margin-start">6</property>
+                <property name="halign">start</property>
+                <property name="valign">center</property>
                 <property name="label" translatable="yes" context="colorconfigwin|values">Values</property>
                 <property name="use-underline">True</property>
                 <property name="mnemonic-widget">values_lb</property>
-                <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="left-attach">0</property>
@@ -1117,9 +1070,7 @@
                 <property name="can-focus">True</property>
                 <property name="receives-default">False</property>
                 <property name="halign">end</property>
-                <property name="xalign">0</property>
                 <property name="draw-indicator">True</property>
-                <property name="label" translatable="no"></property>
                 <child>
                   <placeholder/>
                 </child>
@@ -1133,11 +1084,11 @@
               <object class="GtkLabel" id="formulas">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="margin-start">6</property>
+                <property name="halign">start</property>
+                <property name="valign">center</property>
                 <property name="label" translatable="yes" context="colorconfigwin|formulas">Formulas</property>
                 <property name="use-underline">True</property>
                 <property name="mnemonic-widget">formulas_lb</property>
-                <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="left-attach">0</property>
@@ -1150,9 +1101,7 @@
                 <property name="can-focus">True</property>
                 <property name="receives-default">False</property>
                 <property name="halign">end</property>
-                <property name="xalign">0</property>
                 <property name="draw-indicator">True</property>
-                <property name="label" translatable="no"></property>
                 <child>
                   <placeholder/>
                 </child>
@@ -1166,11 +1115,11 @@
               <object class="GtkLabel" id="text">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="margin-start">6</property>
+                <property name="halign">start</property>
+                <property name="valign">center</property>
                 <property name="label" translatable="yes" context="colorconfigwin|text">Text</property>
                 <property name="use-underline">True</property>
                 <property name="mnemonic-widget">text_lb</property>
-                <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="left-attach">0</property>
@@ -1183,9 +1132,7 @@
                 <property name="can-focus">True</property>
                 <property name="receives-default">False</property>
                 <property name="halign">end</property>
-                <property name="xalign">0</property>
                 <property name="draw-indicator">True</property>
-                <property name="label" translatable="no"></property>
                 <child>
                   <placeholder/>
                 </child>
@@ -1199,11 +1146,11 @@
               <object class="GtkLabel" id="protectedcells">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="margin-start">6</property>
+                <property name="halign">start</property>
+                <property name="valign">center</property>
                 <property name="label" translatable="yes" context="colorconfigwin|protectedcells">Protected cells background</property>
                 <property name="use-underline">True</property>
                 <property name="mnemonic-widget">protectedcells_lb</property>
-                <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="left-attach">0</property>
@@ -1241,7 +1188,7 @@
             <property name="visible">True</property>
             <property name="can-focus">False</property>
             <property name="margin-start">6</property>
-            <property name="margin-end">6</property>
+            <property name="margin-end">12</property>
             <property name="row-spacing">3</property>
             <property name="column-spacing">6</property>
             <child>
@@ -1251,9 +1198,7 @@
                 <property name="receives-default">False</property>
                 <property name="halign">end</property>
                 <property name="hexpand">True</property>
-                <property name="xalign">0</property>
                 <property name="draw-indicator">True</property>
-                <property name="label" translatable="no"></property>
                 <child>
                   <placeholder/>
                 </child>
@@ -1267,11 +1212,11 @@
               <object class="GtkLabel" id="drawgrid">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="margin-start">6</property>
+                <property name="halign">start</property>
+                <property name="valign">center</property>
                 <property name="label" translatable="yes" context="colorconfigwin|drawgrid">Grid</property>
                 <property name="use-underline">True</property>
                 <property name="mnemonic-widget">drawgrid_lb</property>
-                <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="left-attach">0</property>
@@ -1309,7 +1254,7 @@
             <property name="visible">True</property>
             <property name="can-focus">False</property>
             <property name="margin-start">6</property>
-            <property name="margin-end">6</property>
+            <property name="margin-end">12</property>
             <property name="row-spacing">3</property>
             <property name="column-spacing">6</property>
             <child>
@@ -1319,9 +1264,7 @@
                 <property name="receives-default">False</property>
                 <property name="halign">end</property>
                 <property name="hexpand">True</property>
-                <property name="xalign">0</property>
                 <property name="draw-indicator">True</property>
-                <property name="label" translatable="no"></property>
                 <child>
                   <placeholder/>
                 </child>
@@ -1335,11 +1278,11 @@
               <object class="GtkLabel" id="basicid">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="margin-start">6</property>
+                <property name="halign">start</property>
+                <property name="valign">center</property>
                 <property name="label" translatable="yes" context="colorconfigwin|basicid">Identifier</property>
                 <property name="use-underline">True</property>
                 <property name="mnemonic-widget">basicid_lb</property>
-                <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="left-attach">0</property>
@@ -1352,9 +1295,7 @@
                 <property name="can-focus">True</property>
                 <property name="receives-default">False</property>
                 <property name="halign">end</property>
-                <property name="xalign">0</property>
                 <property name="draw-indicator">True</property>
-                <property name="label" translatable="no"></property>
                 <child>
                   <placeholder/>
                 </child>
@@ -1368,11 +1309,11 @@
               <object class="GtkLabel" id="basiccomment">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="margin-start">6</property>
+                <property name="halign">start</property>
+                <property name="valign">center</property>
                 <property name="label" translatable="yes" context="colorconfigwin|basiccomment">Comment</property>
                 <property name="use-underline">True</property>
                 <property name="mnemonic-widget">basiccomment_lb</property>
-                <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="left-attach">0</property>
@@ -1385,9 +1326,7 @@
                 <property name="can-focus">True</property>
                 <property name="receives-default">False</property>
                 <property name="halign">end</property>
-                <property name="xalign">0</property>
                 <property name="draw-indicator">True</property>
-                <property name="label" translatable="no"></property>
                 <child>
                   <placeholder/>
                 </child>
@@ -1401,11 +1340,11 @@
               <object class="GtkLabel" id="basicnumber">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="margin-start">6</property>
+                <property name="halign">start</property>
+                <property name="valign">center</property>
                 <property name="label" translatable="yes" context="colorconfigwin|basicnumber">Number</property>
                 <property name="use-underline">True</property>
                 <property name="mnemonic-widget">basicnumber_lb</property>
-                <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="left-attach">0</property>
@@ -1418,9 +1357,7 @@
                 <property name="can-focus">True</property>
                 <property name="receives-default">False</property>
                 <property name="halign">end</property>
-                <property name="xalign">0</property>
                 <property name="draw-indicator">True</property>
-                <property name="label" translatable="no"></property>
                 <child>
                   <placeholder/>
                 </child>
@@ -1434,11 +1371,11 @@
               <object class="GtkLabel" id="basicstring">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="margin-start">6</property>
+                <property name="halign">start</property>
+                <property name="valign">center</property>
                 <property name="label" translatable="yes" context="colorconfigwin|basicstring">String</property>
                 <property name="use-underline">True</property>
                 <property name="mnemonic-widget">basicstring_lb</property>
-                <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="left-attach">0</property>
@@ -1451,9 +1388,7 @@
                 <property name="can-focus">True</property>
                 <property name="receives-default">False</property>
                 <property name="halign">end</property>
-                <property name="xalign">0</property>
                 <property name="draw-indicator">True</property>
-                <property name="label" translatable="no"></property>
                 <child>
                   <placeholder/>
                 </child>
@@ -1467,11 +1402,11 @@
               <object class="GtkLabel" id="basicop">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="margin-start">6</property>
+                <property name="halign">start</property>
+                <property name="valign">end</property>
                 <property name="label" translatable="yes" context="colorconfigwin|basicop">Operator</property>
                 <property name="use-underline">True</property>
                 <property name="mnemonic-widget">basicop_lb</property>
-                <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="left-attach">0</property>
@@ -1484,9 +1419,7 @@
                 <property name="can-focus">True</property>
                 <property name="receives-default">False</property>
                 <property name="halign">end</property>
-                <property name="xalign">0</property>
                 <property name="draw-indicator">True</property>
-                <property name="label" translatable="no"></property>
                 <child>
                   <placeholder/>
                 </child>
@@ -1500,11 +1433,11 @@
               <object class="GtkLabel" id="basickeyword">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="margin-start">6</property>
+                <property name="halign">start</property>
+                <property name="valign">center</property>
                 <property name="label" translatable="yes" context="colorconfigwin|basickeyword">Reserved expression</property>
                 <property name="use-underline">True</property>
                 <property name="mnemonic-widget">basickeyword_lb</property>
-                <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="left-attach">0</property>
@@ -1517,9 +1450,7 @@
                 <property name="can-focus">True</property>
                 <property name="receives-default">False</property>
                 <property name="halign">end</property>
-                <property name="xalign">0</property>
                 <property name="draw-indicator">True</property>
-                <property name="label" translatable="no"></property>
                 <child>
                   <placeholder/>
                 </child>
@@ -1533,11 +1464,11 @@
               <object class="GtkLabel" id="error">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="margin-start">6</property>
+                <property name="halign">start</property>
+                <property name="valign">center</property>
                 <property name="label" translatable="yes" context="colorconfigwin|error">Error</property>
                 <property name="use-underline">True</property>
                 <property name="mnemonic-widget">error_lb</property>
-                <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="left-attach">0</property>
@@ -1575,7 +1506,7 @@
             <property name="visible">True</property>
             <property name="can-focus">False</property>
             <property name="margin-start">6</property>
-            <property name="margin-end">6</property>
+            <property name="margin-end">12</property>
             <property name="row-spacing">3</property>
             <property name="column-spacing">6</property>
             <child>
@@ -1585,9 +1516,7 @@
                 <property name="receives-default">False</property>
                 <property name="halign">end</property>
                 <property name="hexpand">True</property>
-                <property name="xalign">0</property>
                 <property name="draw-indicator">True</property>
-                <property name="label" translatable="no"></property>
                 <child>
                   <placeholder/>
                 </child>
@@ -1601,11 +1530,11 @@
               <object class="GtkLabel" id="sqlid">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="margin-start">6</property>
+                <property name="halign">start</property>
+                <property name="valign">center</property>
                 <property name="label" translatable="yes" context="colorconfigwin|sqlid">Identifier</property>
                 <property name="use-underline">True</property>
                 <property name="mnemonic-widget">sqlid_lb</property>
-                <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="left-attach">0</property>
@@ -1618,9 +1547,7 @@
                 <property name="can-focus">True</property>
                 <property name="receives-default">False</property>
                 <property name="halign">end</property>
-                <property name="xalign">0</property>
                 <property name="draw-indicator">True</property>
-                <property name="label" translatable="no"></property>
                 <child>
                   <placeholder/>
                 </child>
@@ -1634,11 +1561,11 @@
               <object class="GtkLabel" id="sqlnumber">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="margin-start">6</property>
+                <property name="halign">start</property>
+                <property name="valign">center</property>
                 <property name="label" translatable="yes" context="colorconfigwin|sqlnumber">Number</property>
                 <property name="use-underline">True</property>
                 <property name="mnemonic-widget">sqlnumber_lb</property>
-                <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="left-attach">0</property>
@@ -1651,9 +1578,7 @@
                 <property name="can-focus">True</property>
                 <property name="receives-default">False</property>
                 <property name="halign">end</property>
-                <property name="xalign">0</property>
                 <property name="draw-indicator">True</property>
-                <property name="label" translatable="no"></property>
                 <child>
                   <placeholder/>
                 </child>
@@ -1667,11 +1592,11 @@
               <object class="GtkLabel" id="sqlstring">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="margin-start">6</property>
+                <property name="halign">start</property>
+                <property name="valign">center</property>
                 <property name="label" translatable="yes" context="colorconfigwin|sqlstring">String</property>
                 <property name="use-underline">True</property>
                 <property name="mnemonic-widget">sqlstring_lb</property>
-                <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="left-attach">0</property>
@@ -1684,9 +1609,7 @@
                 <property name="can-focus">True</property>
                 <property name="receives-default">False</property>
                 <property name="halign">end</property>
-                <property name="xalign">0</property>
                 <property name="draw-indicator">True</property>
-                <property name="label" translatable="no"></property>
                 <child>
                   <placeholder/>
                 </child>
@@ -1700,11 +1623,11 @@
               <object class="GtkLabel" id="sqlop">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="margin-start">6</property>
+                <property name="halign">start</property>
+                <property name="valign">center</property>
                 <property name="label" translatable="yes" context="colorconfigwin|sqlop">Operator</property>
                 <property name="use-underline">True</property>
                 <property name="mnemonic-widget">sqlop_lb</property>
-                <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="left-attach">0</property>
@@ -1717,9 +1640,7 @@
                 <property name="can-focus">True</property>
                 <property name="receives-default">False</property>
                 <property name="halign">end</property>
-                <property name="xalign">0</property>
                 <property name="draw-indicator">True</property>
-                <property name="label" translatable="no"></property>
                 <child>
                   <placeholder/>
                 </child>
@@ -1733,11 +1654,11 @@
               <object class="GtkLabel" id="sqlkeyword">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="margin-start">6</property>
+                <property name="halign">start</property>
+                <property name="valign">center</property>
                 <property name="label" translatable="yes" context="colorconfigwin|sqlkeyword">Keyword</property>
                 <property name="use-underline">True</property>
                 <property name="mnemonic-widget">sqlkeyword_lb</property>
-                <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="left-attach">0</property>
@@ -1750,9 +1671,7 @@
                 <property name="can-focus">True</property>
                 <property name="receives-default">False</property>
                 <property name="halign">end</property>
-                <property name="xalign">0</property>
                 <property name="draw-indicator">True</property>
-                <property name="label" translatable="no"></property>
                 <child>
                   <placeholder/>
                 </child>
@@ -1766,11 +1685,11 @@
               <object class="GtkLabel" id="sqlparam">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="margin-start">6</property>
+                <property name="halign">start</property>
+                <property name="valign">center</property>
                 <property name="label" translatable="yes" context="colorconfigwin|sqlparam">Parameter</property>
                 <property name="use-underline">True</property>
                 <property name="mnemonic-widget">sqlparam_lb</property>
-                <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="left-attach">0</property>
@@ -1783,9 +1702,7 @@
                 <property name="can-focus">True</property>
                 <property name="receives-default">False</property>
                 <property name="halign">end</property>
-                <property name="xalign">0</property>
                 <property name="draw-indicator">True</property>
-                <property name="label" translatable="no"></property>
                 <child>
                   <placeholder/>
                 </child>
@@ -1799,11 +1716,11 @@
               <object class="GtkLabel" id="sqlcomment">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="margin-start">6</property>
+                <property name="halign">start</property>
+                <property name="valign">center</property>
                 <property name="label" translatable="yes" context="colorconfigwin|sqlcomment">Comment</property>
                 <property name="use-underline">True</property>
                 <property name="mnemonic-widget">sqlcomment_lb</property>
-                <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="left-attach">0</property>
@@ -1841,7 +1758,7 @@
             <property name="visible">True</property>
             <property name="can-focus">False</property>
             <property name="margin-start">6</property>
-            <property name="margin-end">6</property>
+            <property name="margin-end">12</property>
             <property name="row-spacing">3</property>
             <property name="column-spacing">6</property>
             <child>
@@ -1851,9 +1768,7 @@
                 <property name="receives-default">False</property>
                 <property name="halign">end</property>
                 <property name="hexpand">True</property>
-                <property name="xalign">0</property>
                 <property name="draw-indicator">True</property>
-                <property name="label" translatable="no"></property>
                 <child>
                   <placeholder/>
                 </child>
@@ -1867,11 +1782,11 @@
               <object class="GtkLabel" id="sgml">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="margin-start">6</property>
+                <property name="halign">start</property>
+                <property name="valign">center</property>
                 <property name="label" translatable="yes" context="colorconfigwin|sgml">SGML syntax highlighting</property>
                 <property name="use-underline">True</property>
                 <property name="mnemonic-widget">sgml_lb</property>
-                <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="left-attach">0</property>
@@ -1882,11 +1797,11 @@
               <object class="GtkLabel" id="htmlcomment">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="margin-start">6</property>
+                <property name="halign">start</property>
+                <property name="valign">center</property>
                 <property name="label" translatable="yes" context="colorconfigwin|htmlcomment">Comment highlighting</property>
                 <property name="use-underline">True</property>
                 <property name="mnemonic-widget">htmlcomment_lb</property>
-                <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="left-attach">0</property>
@@ -1899,9 +1814,7 @@
                 <property name="can-focus">True</property>
                 <property name="receives-default">False</property>
                 <property name="halign">end</property>
-                <property name="xalign">0</property>
                 <property name="draw-indicator">True</property>
-                <property name="label" translatable="no"></property>
                 <child>
                   <placeholder/>
                 </child>
@@ -1915,11 +1828,11 @@
               <object class="GtkLabel" id="htmlkeyword">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="margin-start">6</property>
+                <property name="halign">start</property>
+                <property name="valign">center</property>
                 <property name="label" translatable="yes" context="colorconfigwin|htmlkeyword">Keyword highlighting</property>
                 <property name="use-underline">True</property>
                 <property name="mnemonic-widget">htmlkeyword_lb</property>
-                <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="left-attach">0</property>
@@ -1932,9 +1845,7 @@
                 <property name="can-focus">True</property>
                 <property name="receives-default">False</property>
                 <property name="halign">end</property>
-                <property name="xalign">0</property>
                 <property name="draw-indicator">True</property>
-                <property name="label" translatable="no"></property>
                 <child>
                   <placeholder/>
                 </child>
@@ -1948,11 +1859,11 @@
               <object class="GtkLabel" id="unknown">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="margin-start">6</property>
+                <property name="halign">start</property>
+                <property name="valign">center</property>
                 <property name="label" translatable="yes" context="colorconfigwin|unknown">Text</property>
                 <property name="use-underline">True</property>
                 <property name="mnemonic-widget">unknown_lb</property>
-                <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="left-attach">0</property>
@@ -1965,9 +1876,7 @@
                 <property name="can-focus">True</property>
                 <property name="receives-default">False</property>
                 <property name="halign">end</property>
-                <property name="xalign">0</property>
                 <property name="draw-indicator">True</property>
-                <property name="label" translatable="no"></property>
                 <child>
                   <placeholder/>
                 </child>
diff --git a/cui/uiconfig/ui/optappearancepage.ui b/cui/uiconfig/ui/optappearancepage.ui
index 53f26e5f11be..d6e71db121ba 100644
--- a/cui/uiconfig/ui/optappearancepage.ui
+++ b/cui/uiconfig/ui/optappearancepage.ui
@@ -221,7 +221,6 @@
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
                     <property name="no-show-all">True</property>
-                    <property name="label" translatable="yes" context="optappearancepage|on">On</property>
                   </object>
                   <packing>
                     <property name="left-attach">0</property>