diff --git a/gramps/gui/glade/addmedia.glade b/gramps/gui/glade/addmedia.glade
index 5d1dfcb9e..abf877229 100644
--- a/gramps/gui/glade/addmedia.glade
+++ b/gramps/gui/glade/addmedia.glade
@@ -169,7 +169,7 @@
                   <object class="GtkLabel" id="label118">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">_Title:</property>
                     <property name="use_underline">True</property>
                     <property name="justify">center</property>
@@ -201,7 +201,7 @@
                     <property name="receives_default">False</property>
                     <property name="use_action_appearance">False</property>
                     <property name="use_underline">True</property>
-                    <property name="xalign">0.5</property>
+                    <property name="halign">3</property>
                     <property name="draw_indicator">True</property>
                   </object>
                   <packing>
diff --git a/gramps/gui/glade/baseselector.glade b/gramps/gui/glade/baseselector.glade
index bf3a1f16c..8228f3e26 100644
--- a/gramps/gui/glade/baseselector.glade
+++ b/gramps/gui/glade/baseselector.glade
@@ -107,7 +107,7 @@
                 <property name="receives_default">False</property>
                 <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
-                <property name="xalign">0.5</property>
+                <property name="halign">3</property>
                 <property name="draw_indicator">True</property>
               </object>
               <packing>
diff --git a/gramps/gui/glade/book.glade b/gramps/gui/glade/book.glade
index 2ab91e4e4..0dcfa0f60 100644
--- a/gramps/gui/glade/book.glade
+++ b/gramps/gui/glade/book.glade
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.1 -->
+<!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="book">
@@ -317,8 +317,7 @@
                       <object class="GtkLabel" id="avail_label">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="yalign">0</property>
+                        <property name="opacity">0</property>
                         <property name="xpad">12</property>
                         <property name="ypad">6</property>
                         <property name="use_markup">True</property>
@@ -368,8 +367,6 @@
                       <object class="GtkLabel" id="book_label">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="yalign">0</property>
                         <property name="xpad">12</property>
                         <property name="ypad">6</property>
                         <property name="use_markup">True</property>
diff --git a/gramps/gui/glade/configure.glade b/gramps/gui/glade/configure.glade
index fa4552739..4573fe355 100644
--- a/gramps/gui/glade/configure.glade
+++ b/gramps/gui/glade/configure.glade
@@ -75,7 +75,7 @@
                   <object class="GtkLabel" id="name_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">Format _name:</property>
                     <property name="use_underline">True</property>
                     <property name="justify">center</property>
@@ -90,7 +90,7 @@
                   <object class="GtkLabel" id="format_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">Format _definition:</property>
                     <property name="use_underline">True</property>
                     <property name="justify">center</property>
@@ -137,7 +137,7 @@
                       <object class="GtkLabel" id="label706">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="xpad">12</property>
                         <property name="ypad">6</property>
                         <property name="label" translatable="yes">The following conventions are used:
@@ -170,7 +170,7 @@
                   <object class="GtkLabel" id="example_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">Example:</property>
                     <property name="justify">center</property>
                     <property name="mnemonic_widget">example_label</property>
@@ -186,7 +186,7 @@
                   <object class="GtkLabel" id="example_label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="use_markup">True</property>
                     <property name="justify">center</property>
                     <property name="angle">360</property>
diff --git a/gramps/gui/glade/dbman.glade b/gramps/gui/glade/dbman.glade
index fd1383bed..c3f599ad8 100644
--- a/gramps/gui/glade/dbman.glade
+++ b/gramps/gui/glade/dbman.glade
@@ -58,7 +58,7 @@
               <object class="GtkLabel" id="label714">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
+                <property name="halign">1</property>
                 <property name="label" translatable="yes">Version description</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
@@ -302,7 +302,7 @@
                                 <property name="can_focus">True</property>
                                 <property name="can_default">True</property>
                                 <property name="receives_default">False</property>
-                                <property name="xalign">0.50999999046325684</property>
+                                <property name="halign">3</property>
                                 <child>
                                   <object class="GtkBox" id="box1">
                                     <property name="visible">True</property>
diff --git a/gramps/gui/glade/dialog.glade b/gramps/gui/glade/dialog.glade
index fc1536bba..14a73d217 100644
--- a/gramps/gui/glade/dialog.glade
+++ b/gramps/gui/glade/dialog.glade
@@ -56,7 +56,7 @@
               <object class="GtkImage" id="image2713">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="yalign">0</property>
+                <property name="valign">1</property>
                 <property name="stock">gtk-dialog-warning</property>
                 <property name="icon-size">6</property>
               </object>
@@ -70,7 +70,7 @@
               <object class="GtkLabel" id="title">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
+                <property name="halign">1</property>
                 <property name="use_markup">True</property>
                 <property name="wrap">True</property>
               </object>
@@ -88,7 +88,7 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
                 <property name="use_underline">True</property>
-                <property name="xalign">0.5</property>
+                <property name="halign">3</property>
                 <property name="draw_indicator">True</property>
               </object>
               <packing>
@@ -107,7 +107,7 @@
               <object class="GtkLabel" id="message">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
+                <property name="halign">1</property>
                 <property name="ypad">12</property>
                 <property name="wrap">True</property>
               </object>
@@ -186,7 +186,7 @@
               <object class="GtkImage" id="image2723">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="yalign">0</property>
+                <property name="valign">1</property>
                 <property name="stock">gtk-dialog-info</property>
                 <property name="icon-size">6</property>
               </object>
@@ -200,7 +200,7 @@
               <object class="GtkLabel" id="toplabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
+                <property name="halign">1</property>
                 <property name="xpad">6</property>
                 <property name="use_markup">True</property>
                 <property name="wrap">True</property>
@@ -421,7 +421,7 @@
               <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
+                <property name="halign">1</property>
                 <property name="xpad">6</property>
                 <property name="ypad">24</property>
                 <property name="use_markup">True</property>
@@ -441,7 +441,7 @@
               <object class="GtkImage" id="image7">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="yalign">0</property>
+                <property name="valign">1</property>
                 <property name="stock">gtk-dialog-warning</property>
                 <property name="icon-size">6</property>
               </object>
@@ -455,7 +455,7 @@
               <object class="GtkLabel" id="label4">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
+                <property name="halign">1</property>
                 <property name="xpad">6</property>
                 <property name="use_markup">True</property>
                 <property name="wrap">True</property>
@@ -475,7 +475,7 @@
                 <property name="receives_default">False</property>
                 <property name="tooltip_text" translatable="yes">If you check this button, all the missing media files will be automatically treated according to the currently selected option. No further dialogs will be presented for any missing media files.</property>
                 <property name="use_underline">True</property>
-                <property name="xalign">0.5</property>
+                <property name="halign">3</property>
                 <property name="draw_indicator">True</property>
               </object>
               <packing>
@@ -568,7 +568,7 @@
               <object class="GtkLabel" id="od_label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
+                <property name="halign">1</property>
                 <property name="xpad">6</property>
                 <property name="ypad">12</property>
                 <property name="use_markup">True</property>
@@ -587,7 +587,7 @@
               <object class="GtkImage" id="image4">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="yalign">0</property>
+                <property name="valign">1</property>
                 <property name="stock">gtk-dialog-warning</property>
                 <property name="icon-size">6</property>
               </object>
@@ -601,7 +601,7 @@
               <object class="GtkLabel" id="od_label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
+                <property name="halign">1</property>
                 <property name="xpad">6</property>
                 <property name="use_markup">True</property>
                 <property name="wrap">True</property>
@@ -836,7 +836,7 @@
               <object class="GtkLabel" id="sd_label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
+                <property name="halign">1</property>
                 <property name="xpad">6</property>
                 <property name="label" translatable="yes">label</property>
                 <property name="use_markup">True</property>
@@ -855,7 +855,7 @@
               <object class="GtkImage" id="image2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="yalign">0</property>
+                <property name="valign">1</property>
                 <property name="stock">gtk-dialog-warning</property>
                 <property name="icon-size">6</property>
               </object>
@@ -869,7 +869,7 @@
               <object class="GtkLabel" id="sd_label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
+                <property name="halign">1</property>
                 <property name="xpad">6</property>
                 <property name="use_markup">True</property>
                 <property name="wrap">True</property>
@@ -888,7 +888,7 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
                 <property name="use_underline">True</property>
-                <property name="xalign">0.5</property>
+                <property name="halign">3</property>
                 <property name="draw_indicator">True</property>
               </object>
               <packing>
diff --git a/gramps/gui/glade/editaddress.glade b/gramps/gui/glade/editaddress.glade
index b937c3b3f..a1bdcb107 100644
--- a/gramps/gui/glade/editaddress.glade
+++ b/gramps/gui/glade/editaddress.glade
@@ -98,7 +98,7 @@
                   <object class="GtkLabel" id="label209">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">_Date:</property>
                     <property name="use_underline">True</property>
                     <property name="justify">center</property>
@@ -113,7 +113,7 @@
                   <object class="GtkLabel" id="label210">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">St_reet:</property>
                     <property name="use_underline">True</property>
                     <property name="justify">center</property>
@@ -130,7 +130,7 @@
                   <object class="GtkLabel" id="label214">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">C_ity:</property>
                     <property name="use_underline">True</property>
                     <property name="justify">center</property>
@@ -162,7 +162,7 @@
                   <object class="GtkLabel" id="label215">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">_State/County:</property>
                     <property name="use_underline">True</property>
                     <property name="justify">center</property>
@@ -181,7 +181,7 @@
                   <object class="GtkLabel" id="label217">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">_ZIP/Postal code:</property>
                     <property name="use_underline">True</property>
                     <property name="justify">center</property>
@@ -213,7 +213,7 @@
                   <object class="GtkLabel" id="label216">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">Cou_ntry:</property>
                     <property name="use_underline">True</property>
                     <property name="justify">center</property>
@@ -232,7 +232,7 @@
                   <object class="GtkLabel" id="label295">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">Phon_e:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">phone</property>
@@ -406,7 +406,7 @@ Note: Use Residence Event for genealogical address data.</property>
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">_Locality:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">locality</property>
diff --git a/gramps/gui/glade/editattribute.glade b/gramps/gui/glade/editattribute.glade
index 2947df40b..6f965869d 100644
--- a/gramps/gui/glade/editattribute.glade
+++ b/gramps/gui/glade/editattribute.glade
@@ -90,7 +90,7 @@
                   <object class="GtkLabel" id="label171">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">_Attribute:</property>
                     <property name="use_underline">True</property>
                     <property name="justify">center</property>
@@ -105,7 +105,7 @@
                   <object class="GtkLabel" id="label172">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">_Value:</property>
                     <property name="use_underline">True</property>
                     <property name="justify">center</property>
diff --git a/gramps/gui/glade/editchildref.glade b/gramps/gui/glade/editchildref.glade
index a148f37bf..a8f618816 100644
--- a/gramps/gui/glade/editchildref.glade
+++ b/gramps/gui/glade/editchildref.glade
@@ -98,7 +98,7 @@
                   <object class="GtkLabel" id="label653">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">Relationship to _Mother:</property>
                     <property name="use_underline">True</property>
                     <property name="justify">center</property>
@@ -136,7 +136,7 @@
                   <object class="GtkLabel" id="label652">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">Relationship to _Father:</property>
                     <property name="use_underline">True</property>
                     <property name="justify">center</property>
@@ -210,7 +210,7 @@
                   <object class="GtkLabel" id="label716">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">Name Child:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">name</property>
@@ -224,7 +224,7 @@
                   <object class="GtkLabel" id="name">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
diff --git a/gramps/gui/glade/editcitation.glade b/gramps/gui/glade/editcitation.glade
index 922007166..bb9e49ef7 100644
--- a/gramps/gui/glade/editcitation.glade
+++ b/gramps/gui/glade/editcitation.glade
@@ -93,7 +93,7 @@
               <object class="GtkLabel" id="label612">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">1</property>
+                <property name="halign">2</property>
                 <property name="label" translatable="yes">_Date:</property>
                 <property name="use_underline">True</property>
                 <property name="justify">center</property>
@@ -163,7 +163,7 @@
               <object class="GtkLabel" id="label613">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">1</property>
+                <property name="halign">2</property>
                 <property name="label" translatable="yes">_Volume/Page:</property>
                 <property name="use_underline">True</property>
                 <property name="justify">center</property>
@@ -180,7 +180,7 @@
               <object class="GtkLabel" id="label614">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">1</property>
+                <property name="halign">2</property>
                 <property name="label" translatable="yes">Con_fidence:</property>
                 <property name="use_underline">True</property>
                 <property name="justify">center</property>
@@ -242,7 +242,7 @@ Very High =Direct and primary evidence used, or by dominance of the evidence </p
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">1</property>
+                    <property name="halign">2</property>
                     <property name="label" translatable="yes">_ID:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">gid</property>
@@ -282,7 +282,7 @@ Very High =Direct and primary evidence used, or by dominance of the evidence </p
               <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">1</property>
+                <property name="halign">2</property>
                 <property name="label" translatable="yes">Source:</property>
               </object>
               <packing>
@@ -312,7 +312,7 @@ Very High =Direct and primary evidence used, or by dominance of the evidence </p
                   <object class="GtkLabel" id="source">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                   </object>
                   <packing>
                     <property name="expand">True</property>
@@ -379,7 +379,7 @@ Very High =Direct and primary evidence used, or by dominance of the evidence </p
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">1</property>
+                <property name="halign">2</property>
                 <property name="label" translatable="yes">Tags:</property>
               </object>
               <packing>
@@ -393,7 +393,7 @@ Very High =Direct and primary evidence used, or by dominance of the evidence </p
               <object class="GtkLabel" id="tag_label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
+                <property name="halign">1</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -423,7 +423,7 @@ Very High =Direct and primary evidence used, or by dominance of the evidence </p
               <object class="GtkLabel" id="label4">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">1</property>
+                <property name="halign">2</property>
                 <property name="label" translatable="yes">Author:</property>
               </object>
               <packing>
@@ -437,7 +437,7 @@ Very High =Direct and primary evidence used, or by dominance of the evidence </p
               <object class="GtkLabel" id="author">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
+                <property name="halign">1</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
diff --git a/gramps/gui/glade/editdate.glade b/gramps/gui/glade/editdate.glade
index 2681352ee..f70aae516 100644
--- a/gramps/gui/glade/editdate.glade
+++ b/gramps/gui/glade/editdate.glade
@@ -130,7 +130,7 @@
                       <object class="GtkLabel" id="label404">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="label" translatable="yes">Calenda_r:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">calendar_box</property>
@@ -195,7 +195,7 @@
                         <property name="tooltip_text" translatable="yes">Old Style/New Style</property>
                         <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
-                        <property name="xalign">0.5</property>
+                        <property name="halign">3</property>
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
@@ -208,7 +208,7 @@
                       <object class="GtkLabel" id="label717">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">1</property>
+                        <property name="halign">2</property>
                         <property name="label" translatable="yes">Ne_w year begins:  </property>
                         <property name="use_underline">True</property>
                         <property name="justify">right</property>
@@ -270,7 +270,7 @@
                       <object class="GtkLabel" id="label413">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="xpad">6</property>
                         <property name="label" translatable="yes">Q_uality</property>
                         <property name="use_underline">True</property>
@@ -306,7 +306,7 @@
                       <object class="GtkLabel" id="label414">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="xpad">6</property>
                         <property name="label" translatable="yes">_Type</property>
                         <property name="use_underline">True</property>
@@ -342,7 +342,7 @@
                       <object class="GtkLabel" id="label411">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="xpad">6</property>
                         <property name="label" translatable="yes">Date</property>
                         <attributes>
@@ -460,7 +460,7 @@
                       <object class="GtkLabel" id="label412">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="xpad">6</property>
                         <property name="label" translatable="yes">Second date</property>
                         <attributes>
diff --git a/gramps/gui/glade/editevent.glade b/gramps/gui/glade/editevent.glade
index 64011219e..10bbb7207 100644
--- a/gramps/gui/glade/editevent.glade
+++ b/gramps/gui/glade/editevent.glade
@@ -91,7 +91,7 @@
                   <object class="GtkLabel" id="label154">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">_Event type:</property>
                     <property name="use_underline">True</property>
                     <property name="justify">center</property>
@@ -106,7 +106,7 @@
                   <object class="GtkLabel" id="label155">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">_Date:</property>
                     <property name="use_underline">True</property>
                     <property name="justify">center</property>
@@ -162,7 +162,7 @@
                   <object class="GtkLabel" id="label156">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">De_scription:</property>
                     <property name="use_underline">True</property>
                     <property name="justify">center</property>
@@ -194,7 +194,7 @@
                   <object class="GtkLabel" id="label157">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="ypad">3</property>
                     <property name="label" translatable="yes">_Place:</property>
                     <property name="use_underline">True</property>
@@ -239,7 +239,7 @@
                       <object class="GtkLabel" id="place">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="ellipsize">end</property>
                       </object>
                       <packing>
@@ -316,7 +316,7 @@
                   <object class="GtkLabel" id="label656">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">_ID:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">gid</property>
@@ -400,7 +400,7 @@
                       <object class="GtkLabel" id="label1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="label" translatable="yes">Tags:</property>
                       </object>
                       <packing>
@@ -413,8 +413,6 @@
                       <object class="GtkLabel" id="tag_label">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="yalign">0.4699999988079071</property>
                       </object>
                       <packing>
                         <property name="expand">True</property>
diff --git a/gramps/gui/glade/editeventref.glade b/gramps/gui/glade/editeventref.glade
index facdbd12b..9cd336cbf 100644
--- a/gramps/gui/glade/editeventref.glade
+++ b/gramps/gui/glade/editeventref.glade
@@ -76,7 +76,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="xalign">0</property>
+            <property name="halign">1</property>
             <property name="xpad">6</property>
             <property name="ypad">3</property>
             <property name="label" translatable="yes">Reference information</property>
@@ -109,7 +109,7 @@
                   <object class="GtkLabel" id="label513">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="ypad">3</property>
                     <property name="label" translatable="yes">_Role:</property>
                     <property name="use_underline">True</property>
@@ -232,7 +232,7 @@
                       <object class="GtkLabel" id="label501">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="label" translatable="yes">_Event type:</property>
                         <property name="use_underline">True</property>
                         <property name="justify">center</property>
@@ -247,7 +247,7 @@
                       <object class="GtkLabel" id="label502">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="label" translatable="yes">_Date:</property>
                         <property name="use_underline">True</property>
                         <property name="justify">center</property>
@@ -264,7 +264,7 @@
                       <object class="GtkLabel" id="label503">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="label" translatable="yes">De_scription:</property>
                         <property name="use_underline">True</property>
                         <property name="justify">center</property>
@@ -281,7 +281,7 @@
                       <object class="GtkLabel" id="label504">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="ypad">3</property>
                         <property name="label" translatable="yes">_Place:</property>
                         <property name="use_underline">True</property>
@@ -299,7 +299,7 @@
                       <object class="GtkLabel" id="label657">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="label" translatable="yes">_ID:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">gid</property>
@@ -319,7 +319,7 @@
                           <object class="GtkLabel" id="eer_place">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
+                            <property name="halign">1</property>
                           </object>
                           <packing>
                             <property name="expand">True</property>
@@ -512,7 +512,7 @@
                           <object class="GtkImage" id="image2651">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="yalign">0</property>
+                            <property name="valign">1</property>
                             <property name="stock">gtk-dialog-warning</property>
                             <property name="icon_size">6</property>
                           </object>
@@ -527,7 +527,7 @@
                             <property name="width_request">500</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
+                            <property name="halign">1</property>
                             <property name="ypad">4</property>
                             <property name="label" translatable="yes">&lt;b&gt;Note:&lt;/b&gt; Any changes in the shared event information will be reflected in the event itself, for all participants in the event.</property>
                             <property name="use_markup">True</property>
diff --git a/gramps/gui/glade/editfamily.glade b/gramps/gui/glade/editfamily.glade
index 4aac718a9..164b7023a 100644
--- a/gramps/gui/glade/editfamily.glade
+++ b/gramps/gui/glade/editfamily.glade
@@ -109,7 +109,7 @@
                           <object class="GtkLabel" id="label577">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
+                            <property name="halign">1</property>
                             <property name="label" translatable="yes">Name:</property>
                           </object>
                           <packing>
@@ -124,7 +124,7 @@
                           <object class="GtkLabel" id="label578">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
+                            <property name="halign">1</property>
                             <property name="label" translatable="yes">Birth:</property>
                           </object>
                           <packing>
@@ -139,7 +139,7 @@
                           <object class="GtkLabel" id="label579">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
+                            <property name="halign">1</property>
                             <property name="label" translatable="yes">Death:</property>
                           </object>
                           <packing>
@@ -158,7 +158,7 @@
                               <object class="GtkLabel" id="label589">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="xalign">0</property>
+                                <property name="halign">1</property>
                                 <property name="label" translatable="yes">Father/partner1</property>
                                 <attributes>
                                   <attribute name="weight" value="bold"/>
@@ -311,7 +311,7 @@
                           <object class="GtkLabel" id="fbirth">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
+                            <property name="halign">1</property>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
@@ -326,7 +326,7 @@
                           <object class="GtkLabel" id="fdeath">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
+                            <property name="halign">1</property>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
@@ -341,7 +341,7 @@
                           <object class="GtkLabel" id="fname">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
+                            <property name="halign">1</property>
                             <property name="ellipsize">end</property>
                           </object>
                           <packing>
@@ -376,7 +376,7 @@
                           <object class="GtkLabel" id="label565">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
+                            <property name="halign">1</property>
                             <property name="label" translatable="yes">Name:</property>
                           </object>
                           <packing>
@@ -391,7 +391,7 @@
                           <object class="GtkLabel" id="label567">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
+                            <property name="halign">1</property>
                             <property name="label" translatable="yes">Birth:</property>
                           </object>
                           <packing>
@@ -406,7 +406,7 @@
                           <object class="GtkLabel" id="label568">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
+                            <property name="halign">1</property>
                             <property name="label" translatable="yes">Death:</property>
                           </object>
                           <packing>
@@ -421,7 +421,7 @@
                           <object class="GtkLabel" id="mdeath">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
+                            <property name="halign">1</property>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
@@ -436,7 +436,7 @@
                           <object class="GtkLabel" id="mbirth">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
+                            <property name="halign">1</property>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
@@ -455,7 +455,7 @@
                               <object class="GtkLabel" id="label574">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="xalign">0</property>
+                                <property name="halign">1</property>
                                 <property name="label" translatable="yes">Mother/partner2</property>
                                 <attributes>
                                   <attribute name="weight" value="bold"/>
@@ -639,7 +639,7 @@
                           <object class="GtkLabel" id="mname">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
+                            <property name="halign">1</property>
                             <property name="ellipsize">end</property>
                           </object>
                           <packing>
@@ -677,7 +677,7 @@
                       <object class="GtkLabel" id="label542">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="label" translatable="yes">Relationship Information</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
@@ -693,7 +693,7 @@
                       <object class="GtkLabel" id="label229">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="label" translatable="yes">_ID:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">gid</property>
@@ -726,7 +726,7 @@
                       <object class="GtkLabel" id="label202">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="label" translatable="yes">_Type:</property>
                         <property name="use_underline">True</property>
                         <property name="justify">center</property>
@@ -766,7 +766,7 @@
                       <object class="GtkLabel" id="label1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="label" translatable="yes">_Tags:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">tag_button</property>
diff --git a/gramps/gui/glade/editldsord.glade b/gramps/gui/glade/editldsord.glade
index adcd02b25..683baa5d7 100644
--- a/gramps/gui/glade/editldsord.glade
+++ b/gramps/gui/glade/editldsord.glade
@@ -119,7 +119,7 @@
                   <object class="GtkLabel" id="label638">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">_Date:</property>
                     <property name="use_underline">True</property>
                     <property name="justify">center</property>
@@ -136,7 +136,7 @@
                   <object class="GtkLabel" id="label639">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">_Place:</property>
                     <property name="use_underline">True</property>
                     <property name="justify">center</property>
@@ -193,7 +193,7 @@
                   <object class="GtkLabel" id="label645">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">Ordinance:</property>
                   </object>
                   <packing>
@@ -205,7 +205,7 @@
                   <object class="GtkLabel" id="label646">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">LDS _Temple:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">temple</property>
@@ -241,7 +241,7 @@
                 <child>
                   <object class="GtkLabel" id="parents_label">
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">_Family:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">parents_select</property>
@@ -256,7 +256,7 @@
                 <child>
                   <object class="GtkLabel" id="parents">
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
@@ -308,7 +308,7 @@
                   <object class="GtkLabel" id="label647">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">_Status:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">status</property>
@@ -349,7 +349,7 @@
                       <object class="GtkLabel" id="place">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                       </object>
                       <packing>
                         <property name="expand">True</property>
diff --git a/gramps/gui/glade/editlink.glade b/gramps/gui/glade/editlink.glade
index d0eb84bc8..f7da80d20 100644
--- a/gramps/gui/glade/editlink.glade
+++ b/gramps/gui/glade/editlink.glade
@@ -95,7 +95,7 @@
                   <object class="GtkLabel" id="label219">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">Gramps item:</property>
                     <property name="use_underline">True</property>
                     <property name="justify">center</property>
@@ -111,7 +111,7 @@
                   <object class="GtkLabel" id="label220">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">Internet Address:</property>
                     <property name="use_underline">True</property>
                     <property name="justify">center</property>
@@ -128,7 +128,7 @@
                   <object class="GtkLabel" id="label591">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">_Link Type:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">button1</property>
diff --git a/gramps/gui/glade/editlocation.glade b/gramps/gui/glade/editlocation.glade
index 4348058b0..782cc744a 100644
--- a/gramps/gui/glade/editlocation.glade
+++ b/gramps/gui/glade/editlocation.glade
@@ -91,7 +91,7 @@
                   <object class="GtkLabel" id="label180">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">C_ity:</property>
                     <property name="use_underline">True</property>
                     <property name="justify">center</property>
@@ -123,7 +123,7 @@
                   <object class="GtkLabel" id="label663">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">S_treet:</property>
                     <property name="use_underline">True</property>
                     <property name="justify">center</property>
@@ -138,7 +138,7 @@
                   <object class="GtkLabel" id="label184">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">Ch_urch parish:</property>
                     <property name="use_underline">True</property>
                     <property name="justify">center</property>
@@ -172,7 +172,7 @@
                   <object class="GtkLabel" id="label181">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">Co_unty:</property>
                     <property name="use_underline">True</property>
                     <property name="justify">center</property>
@@ -204,7 +204,7 @@
                   <object class="GtkLabel" id="label183">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">_State:</property>
                     <property name="use_underline">True</property>
                     <property name="justify">center</property>
@@ -238,7 +238,7 @@
                   <object class="GtkLabel" id="label182">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">Cou_ntry:</property>
                     <property name="use_underline">True</property>
                     <property name="justify">center</property>
@@ -270,7 +270,7 @@
                   <object class="GtkLabel" id="label297">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">_ZIP/Postal code:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">postal</property>
@@ -302,7 +302,7 @@
                   <object class="GtkLabel" id="label296">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">Phon_e:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">phone</property>
@@ -347,7 +347,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">_Locality:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">locality</property>
diff --git a/gramps/gui/glade/editmedia.glade b/gramps/gui/glade/editmedia.glade
index 8a482dbdc..dc69f09f7 100644
--- a/gramps/gui/glade/editmedia.glade
+++ b/gramps/gui/glade/editmedia.glade
@@ -93,7 +93,7 @@
                   <object class="GtkLabel" id="label181">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">_ID:</property>
                     <property name="use_underline">True</property>
                     <property name="justify">center</property>
@@ -112,7 +112,7 @@
                   <object class="GtkLabel" id="label148">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">_Title:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">description</property>
@@ -128,7 +128,7 @@
                   <object class="GtkLabel" id="label422">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">_Date:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">date_entry</property>
@@ -146,7 +146,7 @@
                   <object class="GtkLabel" id="path_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">_Path:</property>
                     <property name="use_underline">True</property>
                     <property name="justify">center</property>
@@ -394,7 +394,7 @@ Gramps does not store the media internally, it only stores the path! Set the 'Re
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">_Tags:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">tag_button</property>
diff --git a/gramps/gui/glade/editmediaref.glade b/gramps/gui/glade/editmediaref.glade
index 34816df7d..152e1c1b6 100644
--- a/gramps/gui/glade/editmediaref.glade
+++ b/gramps/gui/glade/editmediaref.glade
@@ -113,7 +113,7 @@
                       <object class="GtkLabel" id="label425">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">1</property>
+                        <property name="halign">2</property>
                         <property name="label" translatable="yes">_Corner 2:  X</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">corner2_x</property>
@@ -131,7 +131,7 @@
                       <object class="GtkLabel" id="label428">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">1</property>
+                        <property name="halign">2</property>
                         <property name="label" translatable="yes">Y coordinate|Y</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">corner2_y</property>
@@ -214,7 +214,7 @@ Select a region with clicking and holding the mouse button on the top left corne
                       <object class="GtkLabel" id="label426">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">1</property>
+                        <property name="halign">2</property>
                         <property name="label" translatable="yes">_Corner 1:  X</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">corner1_x</property>
@@ -275,7 +275,7 @@ You can use the mouse on the picture to select a region, or use these spinbutton
                       <object class="GtkLabel" id="label427">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">1</property>
+                        <property name="halign">2</property>
                         <property name="label" translatable="yes">Y coordinate|Y</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">corner1_y</property>
@@ -421,7 +421,7 @@ You can use the mouse on the picture to select a region, or use these spinbutton
                           <object class="GtkLabel" id="label129">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
+                            <property name="halign">1</property>
                             <property name="label" translatable="yes">_Path:</property>
                             <property name="use_underline">True</property>
                             <property name="justify">center</property>
@@ -440,7 +440,7 @@ You can use the mouse on the picture to select a region, or use these spinbutton
                           <object class="GtkLabel" id="label132">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
+                            <property name="halign">1</property>
                             <property name="label" translatable="yes">_ID:</property>
                             <property name="use_underline">True</property>
                             <property name="justify">center</property>
@@ -457,7 +457,7 @@ You can use the mouse on the picture to select a region, or use these spinbutton
                           <object class="GtkLabel" id="label126">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
+                            <property name="halign">1</property>
                             <property name="label" translatable="yes">_Title:</property>
                             <property name="use_underline">True</property>
                             <property name="justify">center</property>
@@ -510,7 +510,7 @@ You can use the mouse on the picture to select a region, or use these spinbutton
                                 <property name="width_request">400</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="xalign">0</property>
+                                <property name="halign">1</property>
                                 <property name="ypad">3</property>
                                 <property name="label" translatable="yes">&lt;b&gt;Note:&lt;/b&gt; Any changes in the shared media object information will be reflected in the media object itself.</property>
                                 <property name="use_markup">True</property>
@@ -575,7 +575,7 @@ You can use the mouse on the picture to select a region, or use these spinbutton
                           <object class="GtkLabel" id="label660">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
+                            <property name="halign">1</property>
                             <property name="label" translatable="yes">Type:</property>
                             <property name="mnemonic_widget">type</property>
                           </object>
@@ -593,7 +593,7 @@ You can use the mouse on the picture to select a region, or use these spinbutton
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="tooltip_text" translatable="yes">Type of media object as indicated by the computer, eg Image, Video, ...</property>
-                            <property name="xalign">0</property>
+                            <property name="halign">1</property>
                           </object>
                           <packing>
                             <property name="left_attach">2</property>
@@ -608,7 +608,7 @@ You can use the mouse on the picture to select a region, or use these spinbutton
                           <object class="GtkLabel" id="label422">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
+                            <property name="halign">1</property>
                             <property name="label" translatable="yes">_Date:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">date_entry</property>
@@ -776,7 +776,7 @@ You can use the mouse on the picture to select a region, or use these spinbutton
                           <object class="GtkLabel" id="label2">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
+                            <property name="halign">1</property>
                             <property name="label" translatable="yes">_Tags:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">tag_button</property>
diff --git a/gramps/gui/glade/editname.glade b/gramps/gui/glade/editname.glade
index b3411a697..e6d7e4b9e 100644
--- a/gramps/gui/glade/editname.glade
+++ b/gramps/gui/glade/editname.glade
@@ -95,7 +95,7 @@
                       <object class="GtkLabel" id="label269">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="xpad">4</property>
                         <property name="label" translatable="yes">_Type:</property>
                         <property name="use_underline">True</property>
@@ -205,7 +205,7 @@
                               <object class="GtkLabel" id="label21">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="xalign">0</property>
+                                <property name="halign">1</property>
                                 <property name="label" translatable="yes">_Given:</property>
                                 <property name="use_underline">True</property>
                                 <property name="justify">center</property>
@@ -220,7 +220,7 @@
                               <object class="GtkLabel" id="titlelabel">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="xalign">0</property>
+                                <property name="halign">1</property>
                                 <property name="label" translatable="yes">T_itle:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">title_field</property>
@@ -236,7 +236,7 @@
                               <object class="GtkLabel" id="label4">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="xalign">0</property>
+                                <property name="halign">1</property>
                                 <property name="label" translatable="yes">Suffi_x:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">suffix</property>
@@ -254,7 +254,7 @@
                               <object class="GtkLabel" id="label444">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="xalign">0</property>
+                                <property name="halign">1</property>
                                 <property name="label" translatable="yes">C_all Name:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">call</property>
@@ -285,7 +285,7 @@
                               <object class="GtkLabel" id="label6">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="xalign">0</property>
+                                <property name="halign">1</property>
                                 <property name="label" translatable="yes">_Nick Name:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">nickname</property>
@@ -361,7 +361,7 @@
                       <object class="GtkLabel" id="label3">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="label" translatable="yes">Given Name(s) </property>
                         <attributes>
                           <attribute name="style" value="italic"/>
@@ -416,7 +416,7 @@
                                   <object class="GtkLabel" id="label7">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="xalign">0</property>
+                                    <property name="halign">1</property>
                                     <property name="label" translatable="yes">_Family Nick Name:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">familynickname</property>
@@ -458,7 +458,7 @@
                       <object class="GtkLabel" id="label5">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="label" translatable="yes">Family Names </property>
                         <attributes>
                           <attribute name="style" value="italic"/>
@@ -512,7 +512,7 @@
                       <object class="GtkLabel" id="label417">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="label" translatable="yes">G_roup as:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">group_as</property>
@@ -528,7 +528,7 @@
                       <object class="GtkLabel" id="label418">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="label" translatable="yes">_Sort as:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">sort_as</property>
@@ -546,7 +546,7 @@
                       <object class="GtkLabel" id="label419">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="label" translatable="yes">_Display as:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">display_as</property>
@@ -586,7 +586,7 @@ Here you can make sure this person is displayed according to a custom name forma
                       <object class="GtkLabel" id="label435">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="label" translatable="yes">Dat_e:</property>
                         <property name="use_underline">True</property>
                         <property name="justify">center</property>
@@ -694,7 +694,7 @@ You will be asked if you want to group this person only, or all people with this
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
diff --git a/gramps/gui/glade/editnote.glade b/gramps/gui/glade/editnote.glade
index 9ea955cb3..893c97655 100644
--- a/gramps/gui/glade/editnote.glade
+++ b/gramps/gui/glade/editnote.glade
@@ -135,7 +135,7 @@
                       <object class="GtkLabel" id="label707">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="label" translatable="yes">_Type:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">type</property>
@@ -174,7 +174,7 @@
                       <object class="GtkLabel" id="label708">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="label" translatable="yes">_ID:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">id</property>
@@ -217,7 +217,7 @@ Use monospace font to keep preformatting.</property>
                         <property name="halign">end</property>
                         <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
-                        <property name="xalign">0.5</property>
+                        <property name="halign">3</property>
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
@@ -266,7 +266,7 @@ Use monospace font to keep preformatting.</property>
                       <object class="GtkLabel" id="label1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="label" translatable="yes">_Tags:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">tag_button</property>
diff --git a/gramps/gui/glade/editperson.glade b/gramps/gui/glade/editperson.glade
index feae29ed0..fa71d5b9a 100644
--- a/gramps/gui/glade/editperson.glade
+++ b/gramps/gui/glade/editperson.glade
@@ -105,7 +105,7 @@
                       <object class="GtkLabel" id="label21">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="xpad">3</property>
                         <property name="ypad">3</property>
                         <property name="label" translatable="yes">_Given:</property>
@@ -148,7 +148,7 @@
                       <object class="GtkLabel" id="label444">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="label" translatable="yes">C_all:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">call</property>
@@ -184,7 +184,7 @@
                       <object class="GtkLabel" id="titlelabel">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="xpad">3</property>
                         <property name="ypad">3</property>
                         <property name="label" translatable="yes">T_itle:</property>
@@ -246,7 +246,7 @@
                       <object class="GtkLabel" id="label6">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="xpad">3</property>
                         <property name="label" translatable="yes">_Nick:</property>
                         <property name="use_underline">True</property>
@@ -298,7 +298,7 @@
                               <object class="GtkImage" id="personPix">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="yalign">0</property>
+                                <property name="valign">1</property>
                               </object>
                             </child>
                           </object>
@@ -325,7 +325,7 @@
                       <object class="GtkLabel" id="label269">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="xpad">3</property>
                         <property name="ypad">3</property>
                         <property name="label" translatable="yes">_Type:</property>
@@ -424,7 +424,7 @@ Indicate that the surname consists of different parts. Every surname has its own
                           <object class="GtkLabel" id="label3">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
+                            <property name="halign">1</property>
                             <property name="ypad">3</property>
                             <property name="label" translatable="yes">General</property>
                             <attributes>
@@ -446,7 +446,7 @@ Indicate that the surname consists of different parts. Every surname has its own
                             <property name="tooltip_text" translatable="yes">Set person as private data</property>
                             <property name="use_action_appearance">False</property>
                             <property name="relief">none</property>
-                            <property name="xalign">1</property>
+                            <property name="halign">2</property>
                             <accelerator key="p" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                             <child internal-child="accessible">
                               <object class="AtkObject" id="private-atkobject">
@@ -492,7 +492,7 @@ Indicate that the surname consists of different parts. Every surname has its own
                           <object class="GtkLabel" id="label2">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
+                            <property name="halign">1</property>
                             <property name="ypad">3</property>
                             <property name="label" translatable="yes">Preferred Name</property>
                             <attributes>
@@ -525,7 +525,7 @@ Indicate that the surname consists of different parts. Every surname has its own
                           <object class="GtkLabel" id="surnamelabel">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
+                            <property name="halign">1</property>
                             <property name="label" translatable="yes">_Surname:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">surname</property>
@@ -587,7 +587,7 @@ Indicate that the surname consists of different parts. Every surname has its own
                       <object class="GtkLabel" id="full_name">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="xpad">3</property>
                         <property name="ypad">3</property>
                         <property name="use_markup">True</property>
@@ -637,7 +637,7 @@ Indicate that the surname consists of different parts. Every surname has its own
                           <object class="GtkLabel" id="originlabel">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
+                            <property name="halign">1</property>
                             <property name="label" translatable="yes">O_rigin:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">cmborigin</property>
@@ -687,7 +687,7 @@ Indicate that the surname consists of different parts. Every surname has its own
                           <object class="GtkLabel" id="label436">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
+                            <property name="halign">1</property>
                             <property name="xpad">6</property>
                             <property name="label" translatable="yes">G_ender:</property>
                             <property name="use_underline">True</property>
@@ -720,7 +720,7 @@ Indicate that the surname consists of different parts. Every surname has its own
                           <object class="GtkLabel" id="label437">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
+                            <property name="halign">1</property>
                             <property name="label" translatable="yes">_ID:</property>
                             <property name="use_underline">True</property>
                             <property name="justify">right</property>
@@ -751,7 +751,7 @@ Indicate that the surname consists of different parts. Every surname has its own
                           <object class="GtkLabel" id="label1">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
+                            <property name="halign">1</property>
                             <property name="xpad">6</property>
                             <property name="label" translatable="yes">_Tags:</property>
                             <property name="use_underline">True</property>
@@ -781,7 +781,7 @@ Indicate that the surname consists of different parts. Every surname has its own
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="use_action_appearance">False</property>
-                            <property name="xalign">1</property>
+                            <property name="halign">2</property>
                             <accessibility>
                               <relation type="labelled-by" target="label1"/>
                             </accessibility>
diff --git a/gramps/gui/glade/editpersonref.glade b/gramps/gui/glade/editpersonref.glade
index d336540dd..e3301931a 100644
--- a/gramps/gui/glade/editpersonref.glade
+++ b/gramps/gui/glade/editpersonref.glade
@@ -93,7 +93,7 @@
                   <object class="GtkLabel" id="label649">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">_Person:</property>
                     <property name="use_underline">True</property>
                     <property name="justify">center</property>
@@ -108,7 +108,7 @@
                   <object class="GtkLabel" id="label650">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">_Association:</property>
                     <property name="use_underline">True</property>
                     <property name="justify">center</property>
@@ -180,7 +180,7 @@ Note: Use Events instead for relations connected to specific time frames or occa
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="tooltip_text" translatable="yes">Use the select button to choose a person that has an association to the edited person.</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
diff --git a/gramps/gui/glade/editplace.glade b/gramps/gui/glade/editplace.glade
index faa228b6f..95fda2f08 100644
--- a/gramps/gui/glade/editplace.glade
+++ b/gramps/gui/glade/editplace.glade
@@ -89,7 +89,7 @@
                   <object class="GtkLabel" id="label244">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">_Title:</property>
                     <property name="use_underline">True</property>
                     <property name="justify">center</property>
@@ -104,7 +104,7 @@
                   <object class="GtkLabel" id="label249">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">L_atitude:</property>
                     <property name="use_underline">True</property>
                     <property name="justify">center</property>
@@ -121,7 +121,7 @@
                   <object class="GtkLabel" id="label250">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">_Longitude:</property>
                     <property name="use_underline">True</property>
                     <property name="justify">center</property>
@@ -153,7 +153,7 @@
                   <object class="GtkLabel" id="label655">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">_ID:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">gid</property>
@@ -223,7 +223,7 @@ You can set these values via the Geography View by searching the place, or via a
                       <object class="GtkLabel" id="label5">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="label" translatable="yes">Code:</property>
                         <property name="use_underline">True</property>
                       </object>
@@ -310,7 +310,7 @@ You can set these values via the Geography View by searching the place, or via a
                   <object class="GtkLabel" id="place_name_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">place|Name:</property>
                   </object>
                   <packing>
@@ -324,7 +324,7 @@ You can set these values via the Geography View by searching the place, or via a
                   <object class="GtkLabel" id="label4">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">Type:</property>
                   </object>
                   <packing>
@@ -376,7 +376,7 @@ You can set these values via the Geography View by searching the place, or via a
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">Tags:</property>
                   </object>
                   <packing>
@@ -392,7 +392,7 @@ You can set these values via the Geography View by searching the place, or via a
                   <object class="GtkLabel" id="tag_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">3</property>
diff --git a/gramps/gui/glade/editplaceref.glade b/gramps/gui/glade/editplaceref.glade
index cfa4098e9..2e9edf324 100644
--- a/gramps/gui/glade/editplaceref.glade
+++ b/gramps/gui/glade/editplaceref.glade
@@ -87,7 +87,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">Place:</property>
                     <property name="use_underline">True</property>
                     <property name="justify">right</property>
@@ -101,7 +101,7 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">Date:</property>
                     <property name="use_underline">True</property>
                   </object>
@@ -168,7 +168,7 @@
                   <object class="GtkLabel" id="place">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
diff --git a/gramps/gui/glade/editreporef.glade b/gramps/gui/glade/editreporef.glade
index 234dbe71c..29b64239a 100644
--- a/gramps/gui/glade/editreporef.glade
+++ b/gramps/gui/glade/editreporef.glade
@@ -88,7 +88,7 @@
               <object class="GtkLabel" id="label631">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
+                <property name="halign">1</property>
                 <property name="xpad">6</property>
                 <property name="ypad">3</property>
                 <property name="label" translatable="yes">Reference information</property>
@@ -122,7 +122,7 @@
                       <object class="GtkLabel" id="label623">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">1</property>
+                        <property name="halign">2</property>
                         <property name="label" translatable="yes">_Media Type:</property>
                         <property name="use_underline">True</property>
                         <property name="justify">center</property>
@@ -137,7 +137,7 @@
                       <object class="GtkLabel" id="label624">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">1</property>
+                        <property name="halign">2</property>
                         <property name="label" translatable="yes">Call n_umber:</property>
                         <property name="use_underline">True</property>
                         <property name="justify">center</property>
@@ -266,7 +266,7 @@
                           <object class="GtkLabel" id="label620">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">1</property>
+                            <property name="halign">2</property>
                             <property name="label" translatable="yes">_Name:</property>
                             <property name="use_underline">True</property>
                             <property name="justify">center</property>
@@ -281,7 +281,7 @@
                           <object class="GtkLabel" id="label621">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">1</property>
+                            <property name="halign">2</property>
                             <property name="label" translatable="yes">_Type:</property>
                             <property name="use_underline">True</property>
                             <property name="justify">center</property>
@@ -330,7 +330,7 @@
                                 <property name="width_request">400</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="xalign">0</property>
+                                <property name="halign">1</property>
                                 <property name="ypad">3</property>
                                 <property name="label" translatable="yes">&lt;b&gt;Note:&lt;/b&gt; Any changes in the shared repository information will be reflected in the repository itself, for all items that reference the repository.</property>
                                 <property name="use_markup">True</property>
@@ -355,7 +355,7 @@
                           <object class="GtkLabel" id="label634">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">1</property>
+                            <property name="halign">2</property>
                             <property name="label" translatable="yes">_ID:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">gid</property>
diff --git a/gramps/gui/glade/editrepository.glade b/gramps/gui/glade/editrepository.glade
index 85762530d..50f12c2fb 100644
--- a/gramps/gui/glade/editrepository.glade
+++ b/gramps/gui/glade/editrepository.glade
@@ -91,7 +91,7 @@
                   <object class="GtkLabel" id="label448">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">_Name:</property>
                     <property name="use_underline">True</property>
                     <property name="justify">center</property>
@@ -106,7 +106,7 @@
                   <object class="GtkLabel" id="label449">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">_Type:</property>
                     <property name="use_underline">True</property>
                     <property name="justify">center</property>
@@ -160,7 +160,7 @@
                       <object class="GtkLabel" id="label633">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">1</property>
+                        <property name="halign">2</property>
                         <property name="label" translatable="yes">_ID:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">gid</property>
@@ -232,7 +232,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">Tags:</property>
                     <property name="justify">right</property>
                   </object>
@@ -251,7 +251,7 @@
                       <object class="GtkLabel" id="tag_label">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                       </object>
                       <packing>
                         <property name="expand">True</property>
diff --git a/gramps/gui/glade/editsource.glade b/gramps/gui/glade/editsource.glade
index 9c64145e8..90ff1d330 100644
--- a/gramps/gui/glade/editsource.glade
+++ b/gramps/gui/glade/editsource.glade
@@ -91,7 +91,7 @@
                   <object class="GtkLabel" id="label165">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">_Title:</property>
                     <property name="use_underline">True</property>
                     <property name="justify">center</property>
@@ -106,7 +106,7 @@
                   <object class="GtkLabel" id="label166">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">_Author:</property>
                     <property name="use_underline">True</property>
                     <property name="justify">center</property>
@@ -150,7 +150,7 @@
                   <object class="GtkLabel" id="label167">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">_Pub. info.:</property>
                     <property name="use_underline">True</property>
                     <property name="justify">center</property>
@@ -195,7 +195,7 @@
                   <object class="GtkLabel" id="label392">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">A_bbreviation:</property>
                     <property name="use_underline">True</property>
                     <property name="justify">center</property>
@@ -232,7 +232,7 @@
                       <object class="GtkLabel" id="label1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="label" translatable="yes">Tags:</property>
                       </object>
                       <packing>
@@ -245,7 +245,7 @@
                       <object class="GtkLabel" id="tag_label">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="ypad">2</property>
                       </object>
                       <packing>
@@ -268,7 +268,7 @@
                   <object class="GtkLabel" id="label658">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">_ID:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">gid</property>
diff --git a/gramps/gui/glade/editurl.glade b/gramps/gui/glade/editurl.glade
index c1363a560..cef6cbcb2 100644
--- a/gramps/gui/glade/editurl.glade
+++ b/gramps/gui/glade/editurl.glade
@@ -94,7 +94,7 @@
                   <object class="GtkLabel" id="label219">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">_Web address:</property>
                     <property name="use_underline">True</property>
                     <property name="justify">center</property>
@@ -111,7 +111,7 @@
                   <object class="GtkLabel" id="label220">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">_Description:</property>
                     <property name="use_underline">True</property>
                     <property name="justify">center</property>
@@ -128,7 +128,7 @@
                   <object class="GtkLabel" id="label591">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">_Type:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">type</property>
diff --git a/gramps/gui/glade/mergecitation.glade b/gramps/gui/glade/mergecitation.glade
index 26d1fe0c4..6b5c4361d 100644
--- a/gramps/gui/glade/mergecitation.glade
+++ b/gramps/gui/glade/mergecitation.glade
@@ -116,7 +116,7 @@ primary data for the merged citation.</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="use_action_appearance">False</property>
-                    <property name="xalign">0.5</property>
+                    <property name="halign">3</property>
                     <property name="draw_indicator">True</property>
                     <child>
                       <object class="GtkLabel" id="label_handle_btn1">
@@ -140,7 +140,7 @@ primary data for the merged citation.</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="use_action_appearance">False</property>
-                    <property name="xalign">0.5</property>
+                    <property name="halign">3</property>
                     <property name="draw_indicator">True</property>
                     <property name="group">handle_btn1</property>
                     <child>
@@ -234,7 +234,7 @@ primary data for the merged citation.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -253,7 +253,7 @@ primary data for the merged citation.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">page_btn1</property>
                           </object>
@@ -275,7 +275,7 @@ primary data for the merged citation.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -294,7 +294,7 @@ primary data for the merged citation.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">date_btn1</property>
                           </object>
@@ -316,7 +316,7 @@ primary data for the merged citation.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -335,7 +335,7 @@ primary data for the merged citation.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">confidence_btn1</property>
                           </object>
@@ -357,7 +357,7 @@ primary data for the merged citation.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -376,7 +376,7 @@ primary data for the merged citation.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">gramps_btn1</property>
                           </object>
diff --git a/gramps/gui/glade/mergedata.glade b/gramps/gui/glade/mergedata.glade
index e49696f16..8b2c29b57 100644
--- a/gramps/gui/glade/mergedata.glade
+++ b/gramps/gui/glade/mergedata.glade
@@ -173,7 +173,7 @@
                     <property name="receives_default">False</property>
                     <property name="use_action_appearance">False</property>
                     <property name="use_underline">True</property>
-                    <property name="xalign">0.5</property>
+                    <property name="halign">3</property>
                     <property name="draw_indicator">True</property>
                   </object>
                   <packing>
@@ -194,7 +194,7 @@
                     <property name="receives_default">False</property>
                     <property name="use_action_appearance">False</property>
                     <property name="use_underline">True</property>
-                    <property name="xalign">0.5</property>
+                    <property name="halign">3</property>
                     <property name="active">True</property>
                     <property name="draw_indicator">True</property>
                     <property name="group">select2</property>
@@ -345,7 +345,7 @@
                   <object class="GtkLabel" id="label84">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="justify">center</property>
                   </object>
                   <packing>
@@ -359,7 +359,7 @@
                   <object class="GtkLabel" id="label85">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="justify">center</property>
                   </object>
                   <packing>
@@ -379,7 +379,7 @@
                     <property name="receives_default">False</property>
                     <property name="use_action_appearance">False</property>
                     <property name="use_underline">True</property>
-                    <property name="xalign">0.5</property>
+                    <property name="halign">3</property>
                     <property name="active">True</property>
                     <property name="draw_indicator">True</property>
                   </object>
@@ -398,7 +398,7 @@
                     <property name="receives_default">False</property>
                     <property name="use_action_appearance">False</property>
                     <property name="use_underline">True</property>
-                    <property name="xalign">0.5</property>
+                    <property name="halign">3</property>
                     <property name="draw_indicator">True</property>
                     <property name="group">person1</property>
                   </object>
@@ -568,7 +568,7 @@
                   <object class="GtkLabel" id="title1_text">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="justify">center</property>
                   </object>
                   <packing>
@@ -584,7 +584,7 @@
                   <object class="GtkLabel" id="title2_text">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="justify">center</property>
                   </object>
                   <packing>
@@ -600,7 +600,7 @@
                   <object class="GtkLabel" id="label86">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">Title selection</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
@@ -621,7 +621,7 @@
                     <property name="receives_default">False</property>
                     <property name="use_action_appearance">False</property>
                     <property name="use_underline">True</property>
-                    <property name="xalign">0.5</property>
+                    <property name="halign">3</property>
                     <property name="active">True</property>
                     <property name="draw_indicator">True</property>
                   </object>
@@ -643,7 +643,7 @@
                     <property name="receives_default">False</property>
                     <property name="use_action_appearance">False</property>
                     <property name="use_underline">True</property>
-                    <property name="xalign">0.5</property>
+                    <property name="halign">3</property>
                     <property name="draw_indicator">True</property>
                     <property name="group">place1</property>
                   </object>
@@ -665,7 +665,7 @@
                     <property name="receives_default">False</property>
                     <property name="use_action_appearance">False</property>
                     <property name="use_underline">True</property>
-                    <property name="xalign">0.5</property>
+                    <property name="halign">3</property>
                     <property name="draw_indicator">True</property>
                     <property name="group">place1</property>
                   </object>
@@ -834,7 +834,7 @@
               <object class="GtkLabel" id="label81">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
+                <property name="halign">1</property>
                 <property name="label" translatable="yes">Source 1</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
@@ -852,7 +852,7 @@
               <object class="GtkLabel" id="label82">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
+                <property name="halign">1</property>
                 <property name="label" translatable="yes">Source 2</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
@@ -876,7 +876,7 @@
                 <property name="receives_default">False</property>
                 <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
-                <property name="xalign">0.5</property>
+                <property name="halign">3</property>
                 <property name="draw_indicator">True</property>
               </object>
               <packing>
@@ -897,7 +897,7 @@
                 <property name="receives_default">False</property>
                 <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
-                <property name="xalign">0.5</property>
+                <property name="halign">3</property>
                 <property name="draw_indicator">True</property>
                 <property name="group">title_btn1</property>
               </object>
@@ -919,7 +919,7 @@
                 <property name="receives_default">False</property>
                 <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
-                <property name="xalign">0.5</property>
+                <property name="halign">3</property>
                 <property name="draw_indicator">True</property>
               </object>
               <packing>
@@ -940,7 +940,7 @@
                 <property name="receives_default">False</property>
                 <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
-                <property name="xalign">0.5</property>
+                <property name="halign">3</property>
                 <property name="draw_indicator">True</property>
                 <property name="group">author_btn1</property>
               </object>
@@ -962,7 +962,7 @@
                 <property name="receives_default">False</property>
                 <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
-                <property name="xalign">0.5</property>
+                <property name="halign">3</property>
                 <property name="draw_indicator">True</property>
               </object>
               <packing>
@@ -983,7 +983,7 @@
                 <property name="receives_default">False</property>
                 <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
-                <property name="xalign">0.5</property>
+                <property name="halign">3</property>
                 <property name="draw_indicator">True</property>
                 <property name="group">abbrev_btn1</property>
               </object>
@@ -1005,7 +1005,7 @@
                 <property name="receives_default">False</property>
                 <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
-                <property name="xalign">0.5</property>
+                <property name="halign">3</property>
                 <property name="draw_indicator">True</property>
               </object>
               <packing>
@@ -1026,7 +1026,7 @@
                 <property name="receives_default">False</property>
                 <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
-                <property name="xalign">0.5</property>
+                <property name="halign">3</property>
                 <property name="draw_indicator">True</property>
                 <property name="group">pub_btn1</property>
               </object>
@@ -1048,7 +1048,7 @@
                 <property name="receives_default">False</property>
                 <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
-                <property name="xalign">0.5</property>
+                <property name="halign">3</property>
                 <property name="draw_indicator">True</property>
               </object>
               <packing>
@@ -1069,7 +1069,7 @@
                 <property name="receives_default">False</property>
                 <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
-                <property name="xalign">0.5</property>
+                <property name="halign">3</property>
                 <property name="draw_indicator">True</property>
                 <property name="group">gramps_btn1</property>
               </object>
diff --git a/gramps/gui/glade/mergeevent.glade b/gramps/gui/glade/mergeevent.glade
index af4833dd6..ca1068f2d 100644
--- a/gramps/gui/glade/mergeevent.glade
+++ b/gramps/gui/glade/mergeevent.glade
@@ -116,7 +116,7 @@ primary data for the merged event.</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="use_action_appearance">False</property>
-                    <property name="xalign">0.5</property>
+                    <property name="halign">3</property>
                     <property name="draw_indicator">True</property>
                     <child>
                       <object class="GtkLabel" id="label_handle_btn1">
@@ -140,7 +140,7 @@ primary data for the merged event.</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="use_action_appearance">False</property>
-                    <property name="xalign">0.5</property>
+                    <property name="halign">3</property>
                     <property name="draw_indicator">True</property>
                     <property name="group">handle_btn1</property>
                     <child>
@@ -222,7 +222,7 @@ primary data for the merged event.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -241,7 +241,7 @@ primary data for the merged event.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">type_btn1</property>
                           </object>
@@ -263,7 +263,7 @@ primary data for the merged event.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -282,7 +282,7 @@ primary data for the merged event.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">date_btn1</property>
                           </object>
@@ -304,7 +304,7 @@ primary data for the merged event.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -323,7 +323,7 @@ primary data for the merged event.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">place_btn1</property>
                           </object>
@@ -345,7 +345,7 @@ primary data for the merged event.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -364,7 +364,7 @@ primary data for the merged event.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">desc_btn1</property>
                           </object>
@@ -386,7 +386,7 @@ primary data for the merged event.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -405,7 +405,7 @@ primary data for the merged event.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">gramps_btn1</property>
                           </object>
diff --git a/gramps/gui/glade/mergefamily.glade b/gramps/gui/glade/mergefamily.glade
index 4e1398a12..b030ddd6d 100644
--- a/gramps/gui/glade/mergefamily.glade
+++ b/gramps/gui/glade/mergefamily.glade
@@ -118,7 +118,7 @@ primary data for the merged family.</property>
                     <property name="receives_default">False</property>
                     <property name="hexpand">True</property>
                     <property name="use_action_appearance">False</property>
-                    <property name="xalign">0.5</property>
+                    <property name="halign">3</property>
                     <property name="draw_indicator">True</property>
                     <child>
                       <object class="GtkLabel" id="label_handle_btn1">
@@ -143,7 +143,7 @@ primary data for the merged family.</property>
                     <property name="receives_default">False</property>
                     <property name="hexpand">True</property>
                     <property name="use_action_appearance">False</property>
-                    <property name="xalign">0.5</property>
+                    <property name="halign">3</property>
                     <property name="draw_indicator">True</property>
                     <property name="group">handle_btn1</property>
                     <child>
@@ -225,7 +225,7 @@ primary data for the merged family.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -244,7 +244,7 @@ primary data for the merged family.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">father_btn1</property>
                           </object>
@@ -266,7 +266,7 @@ primary data for the merged family.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -285,7 +285,7 @@ primary data for the merged family.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">mother_btn1</property>
                           </object>
@@ -307,7 +307,7 @@ primary data for the merged family.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -326,7 +326,7 @@ primary data for the merged family.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">rel_btn1</property>
                           </object>
@@ -348,7 +348,7 @@ primary data for the merged family.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -367,7 +367,7 @@ primary data for the merged family.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">gramps_btn1</property>
                           </object>
diff --git a/gramps/gui/glade/mergemedia.glade b/gramps/gui/glade/mergemedia.glade
index a766eb71a..f9a04f8fa 100644
--- a/gramps/gui/glade/mergemedia.glade
+++ b/gramps/gui/glade/mergemedia.glade
@@ -116,7 +116,7 @@ primary data for the merged object.</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="use_action_appearance">False</property>
-                    <property name="xalign">0.5</property>
+                    <property name="halign">3</property>
                     <property name="draw_indicator">True</property>
                     <child>
                       <object class="GtkLabel" id="label_handle_btn1">
@@ -140,7 +140,7 @@ primary data for the merged object.</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="use_action_appearance">False</property>
-                    <property name="xalign">0.5</property>
+                    <property name="halign">3</property>
                     <property name="draw_indicator">True</property>
                     <property name="group">handle_btn1</property>
                     <child>
@@ -222,7 +222,7 @@ primary data for the merged object.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -241,7 +241,7 @@ primary data for the merged object.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">desc_btn1</property>
                           </object>
@@ -263,7 +263,7 @@ primary data for the merged object.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -282,7 +282,7 @@ primary data for the merged object.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">path_btn1</property>
                           </object>
@@ -304,7 +304,7 @@ primary data for the merged object.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -323,7 +323,7 @@ primary data for the merged object.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">date_btn1</property>
                           </object>
@@ -345,7 +345,7 @@ primary data for the merged object.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -364,7 +364,7 @@ primary data for the merged object.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">gramps_btn1</property>
                           </object>
diff --git a/gramps/gui/glade/mergenote.glade b/gramps/gui/glade/mergenote.glade
index e85271884..a226fe8f3 100644
--- a/gramps/gui/glade/mergenote.glade
+++ b/gramps/gui/glade/mergenote.glade
@@ -116,7 +116,7 @@ primary data for the merged note.</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="use_action_appearance">False</property>
-                    <property name="xalign">0.5</property>
+                    <property name="halign">3</property>
                     <property name="draw_indicator">True</property>
                     <child>
                       <object class="GtkLabel" id="label_handle_btn1">
@@ -140,7 +140,7 @@ primary data for the merged note.</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="use_action_appearance">False</property>
-                    <property name="xalign">0.5</property>
+                    <property name="halign">3</property>
                     <property name="draw_indicator">True</property>
                     <property name="group">handle_btn1</property>
                     <child>
@@ -222,7 +222,7 @@ primary data for the merged note.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -241,7 +241,7 @@ primary data for the merged note.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">text_btn1</property>
                           </object>
@@ -263,7 +263,7 @@ primary data for the merged note.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -282,7 +282,7 @@ primary data for the merged note.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">type_btn1</property>
                           </object>
@@ -304,7 +304,7 @@ primary data for the merged note.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -323,7 +323,7 @@ primary data for the merged note.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">format_btn1</property>
                           </object>
@@ -345,7 +345,7 @@ primary data for the merged note.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -364,7 +364,7 @@ primary data for the merged note.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">gramps_btn1</property>
                           </object>
diff --git a/gramps/gui/glade/mergeperson.glade b/gramps/gui/glade/mergeperson.glade
index 1c73a3a81..2e4163ebd 100644
--- a/gramps/gui/glade/mergeperson.glade
+++ b/gramps/gui/glade/mergeperson.glade
@@ -124,7 +124,7 @@ primary data for the merged person.</property>
                     <property name="receives_default">False</property>
                     <property name="hexpand">True</property>
                     <property name="use_action_appearance">False</property>
-                    <property name="xalign">0.5</property>
+                    <property name="halign">3</property>
                     <property name="draw_indicator">True</property>
                     <child>
                       <object class="GtkLabel" id="label_handle_btn1">
@@ -150,7 +150,7 @@ primary data for the merged person.</property>
                     <property name="receives_default">False</property>
                     <property name="hexpand">True</property>
                     <property name="use_action_appearance">False</property>
-                    <property name="xalign">0.5</property>
+                    <property name="halign">3</property>
                     <property name="draw_indicator">True</property>
                     <property name="group">handle_btn1</property>
                     <child>
@@ -233,7 +233,7 @@ primary data for the merged person.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -252,7 +252,7 @@ primary data for the merged person.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">name_btn1</property>
                           </object>
@@ -274,7 +274,7 @@ primary data for the merged person.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -293,7 +293,7 @@ primary data for the merged person.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">gender_btn1</property>
                           </object>
@@ -315,7 +315,7 @@ primary data for the merged person.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -334,7 +334,7 @@ primary data for the merged person.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">gramps_btn1</property>
                           </object>
diff --git a/gramps/gui/glade/mergeplace.glade b/gramps/gui/glade/mergeplace.glade
index 95df28901..df0b4970f 100644
--- a/gramps/gui/glade/mergeplace.glade
+++ b/gramps/gui/glade/mergeplace.glade
@@ -108,7 +108,7 @@ primary data for the merged place.</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
-                    <property name="xalign">0.5</property>
+                    <property name="halign">3</property>
                     <property name="draw_indicator">True</property>
                     <child>
                       <object class="GtkLabel" id="label_handle_btn1">
@@ -130,7 +130,7 @@ primary data for the merged place.</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
-                    <property name="xalign">0.5</property>
+                    <property name="halign">3</property>
                     <property name="draw_indicator">True</property>
                     <property name="group">handle_btn1</property>
                     <child>
@@ -210,7 +210,7 @@ primary data for the merged place.</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -227,7 +227,7 @@ primary data for the merged place.</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">title_btn1</property>
                           </object>
@@ -247,7 +247,7 @@ primary data for the merged place.</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -264,7 +264,7 @@ primary data for the merged place.</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">lat_btn1</property>
                           </object>
@@ -284,7 +284,7 @@ primary data for the merged place.</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -301,7 +301,7 @@ primary data for the merged place.</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">long_btn1</property>
                           </object>
@@ -321,7 +321,7 @@ primary data for the merged place.</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -338,7 +338,7 @@ primary data for the merged place.</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">gramps_btn1</property>
                           </object>
@@ -477,7 +477,7 @@ primary data for the merged place.</property>
                             <property name="receives_default">False</property>
                             <property name="relief">half</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0</property>
+                            <property name="halign">1</property>
                             <property name="active">True</property>
                             <property name="draw_indicator">True</property>
                           </object>
@@ -496,7 +496,7 @@ primary data for the merged place.</property>
                             <property name="receives_default">False</property>
                             <property name="relief">half</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0</property>
+                            <property name="halign">1</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">name_btn1</property>
                           </object>
@@ -549,7 +549,7 @@ primary data for the merged place.</property>
                             <property name="receives_default">False</property>
                             <property name="relief">half</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0</property>
+                            <property name="halign">1</property>
                             <property name="active">True</property>
                             <property name="draw_indicator">True</property>
                           </object>
@@ -568,7 +568,7 @@ primary data for the merged place.</property>
                             <property name="receives_default">False</property>
                             <property name="relief">half</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0</property>
+                            <property name="halign">1</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">type_btn1</property>
                           </object>
@@ -621,7 +621,7 @@ primary data for the merged place.</property>
                             <property name="receives_default">False</property>
                             <property name="relief">half</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0</property>
+                            <property name="halign">1</property>
                             <property name="active">True</property>
                             <property name="draw_indicator">True</property>
                           </object>
@@ -639,7 +639,7 @@ primary data for the merged place.</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0</property>
+                            <property name="halign">1</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">code_btn1</property>
                           </object>
diff --git a/gramps/gui/glade/mergerepository.glade b/gramps/gui/glade/mergerepository.glade
index 52abe4cc5..9dbeca2d9 100644
--- a/gramps/gui/glade/mergerepository.glade
+++ b/gramps/gui/glade/mergerepository.glade
@@ -116,7 +116,7 @@ primary data for the merged repository.</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="use_action_appearance">False</property>
-                    <property name="xalign">0.5</property>
+                    <property name="halign">3</property>
                     <property name="draw_indicator">True</property>
                     <child>
                       <object class="GtkLabel" id="label_handle_btn1">
@@ -140,7 +140,7 @@ primary data for the merged repository.</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="use_action_appearance">False</property>
-                    <property name="xalign">0.5</property>
+                    <property name="halign">3</property>
                     <property name="draw_indicator">True</property>
                     <property name="group">handle_btn1</property>
                     <child>
@@ -222,7 +222,7 @@ primary data for the merged repository.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -241,7 +241,7 @@ primary data for the merged repository.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">name_btn1</property>
                           </object>
@@ -263,7 +263,7 @@ primary data for the merged repository.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -282,7 +282,7 @@ primary data for the merged repository.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">type_btn1</property>
                           </object>
@@ -304,7 +304,7 @@ primary data for the merged repository.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -323,7 +323,7 @@ primary data for the merged repository.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">gramps_btn1</property>
                           </object>
diff --git a/gramps/gui/glade/mergesource.glade b/gramps/gui/glade/mergesource.glade
index 20c34c219..8e93f1f7d 100644
--- a/gramps/gui/glade/mergesource.glade
+++ b/gramps/gui/glade/mergesource.glade
@@ -116,7 +116,7 @@ primary data for the merged source.</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="use_action_appearance">False</property>
-                    <property name="xalign">0.5</property>
+                    <property name="halign">3</property>
                     <property name="draw_indicator">True</property>
                     <child>
                       <object class="GtkLabel" id="label_handle_btn1">
@@ -140,7 +140,7 @@ primary data for the merged source.</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="use_action_appearance">False</property>
-                    <property name="xalign">0.5</property>
+                    <property name="halign">3</property>
                     <property name="draw_indicator">True</property>
                     <property name="group">handle_btn1</property>
                     <child>
@@ -222,7 +222,7 @@ primary data for the merged source.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -241,7 +241,7 @@ primary data for the merged source.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">title_btn1</property>
                           </object>
@@ -263,7 +263,7 @@ primary data for the merged source.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -282,7 +282,7 @@ primary data for the merged source.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">author_btn1</property>
                           </object>
@@ -304,7 +304,7 @@ primary data for the merged source.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -323,7 +323,7 @@ primary data for the merged source.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">abbrev_btn1</property>
                           </object>
@@ -345,7 +345,7 @@ primary data for the merged source.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -364,7 +364,7 @@ primary data for the merged source.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">pub_btn1</property>
                           </object>
@@ -386,7 +386,7 @@ primary data for the merged source.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -405,7 +405,7 @@ primary data for the merged source.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">gramps_btn1</property>
                           </object>
diff --git a/gramps/gui/glade/papermenu.glade b/gramps/gui/glade/papermenu.glade
index 6ec066cdb..0b4518326 100644
--- a/gramps/gui/glade/papermenu.glade
+++ b/gramps/gui/glade/papermenu.glade
@@ -21,7 +21,7 @@
               <object class="GtkLabel" id="label14">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
+                <property name="halign">1</property>
                 <property name="label" translatable="yes">Paper format</property>
               </object>
               <packing>
@@ -54,7 +54,7 @@
                       <object class="GtkLabel" id="label1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="label" translatable="yes">Size:</property>
                       </object>
                       <packing>
@@ -66,7 +66,7 @@
                       <object class="GtkLabel" id="label5">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="label" translatable="yes">_Width:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">pwidth</property>
@@ -82,7 +82,7 @@
                       <object class="GtkLabel" id="label2">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="label" translatable="yes">_Height:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">pheight</property>
@@ -98,7 +98,7 @@
                       <object class="GtkLabel" id="label4">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="label" translatable="yes">Orientation:</property>
                       </object>
                       <packing>
@@ -127,7 +127,7 @@
                       <object class="GtkLabel" id="lunits1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="label" translatable="yes">cm</property>
                         <property name="width_chars">3</property>
                       </object>
@@ -144,7 +144,7 @@
                       <object class="GtkLabel" id="lunits2">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="label" translatable="yes">cm</property>
                         <property name="width_chars">3</property>
                       </object>
@@ -202,7 +202,7 @@
               <object class="GtkLabel" id="label13">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
+                <property name="halign">1</property>
                 <property name="label" translatable="yes">Margins</property>
               </object>
               <packing>
@@ -229,7 +229,7 @@
                       <object class="GtkLabel" id="label9">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="label" translatable="yes">_Left:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">lmargin</property>
@@ -243,7 +243,7 @@
                       <object class="GtkLabel" id="label10">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="label" translatable="yes">_Right:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">rmargin</property>
@@ -259,7 +259,7 @@
                       <object class="GtkLabel" id="label11">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="label" translatable="yes">_Top:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">tmargin</property>
@@ -275,7 +275,7 @@
                       <object class="GtkLabel" id="label12">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="label" translatable="yes">_Bottom:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">bmargin</property>
@@ -291,7 +291,7 @@
                       <object class="GtkLabel" id="lunits3">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="label" translatable="yes">cm</property>
                         <property name="width_chars">3</property>
                       </object>
@@ -306,7 +306,7 @@
                       <object class="GtkLabel" id="lunits5">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="label" translatable="yes">cm</property>
                         <property name="width_chars">3</property>
                       </object>
@@ -323,7 +323,7 @@
                       <object class="GtkLabel" id="lunits6">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="label" translatable="yes">cm</property>
                         <property name="width_chars">3</property>
                       </object>
@@ -398,7 +398,7 @@
                       <object class="GtkLabel" id="lunits4">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="label" translatable="yes">cm</property>
                         <property name="width_chars">3</property>
                       </object>
@@ -443,7 +443,7 @@
                 <property name="receives_default">False</property>
                 <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
-                <property name="xalign">0.5</property>
+                <property name="halign">3</property>
                 <property name="active">True</property>
                 <property name="draw_indicator">True</property>
               </object>
diff --git a/gramps/gui/glade/plugins.glade b/gramps/gui/glade/plugins.glade
index f6d52ab25..ef7365114 100644
--- a/gramps/gui/glade/plugins.glade
+++ b/gramps/gui/glade/plugins.glade
@@ -105,7 +105,7 @@
                       <object class="GtkLabel" id="title">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="xpad">10</property>
                         <property name="ypad">10</property>
                         <property name="use_markup">True</property>
@@ -129,8 +129,8 @@
                   <object class="GtkLabel" id="description">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
-                    <property name="yalign">0</property>
+                    <property name="halign">1</property>
+                    <property name="valign">1</property>
                     <property name="xpad">10</property>
                     <property name="ypad">20</property>
                     <property name="label" translatable="yes">Select a report from those available on the left.</property>
@@ -151,7 +151,7 @@
                       <object class="GtkLabel" id="report_label">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">1</property>
+                        <property name="halign">2</property>
                         <property name="xpad">3</property>
                         <property name="ypad">3</property>
                         <property name="label" translatable="yes">Status:</property>
@@ -166,7 +166,7 @@
                       <object class="GtkLabel" id="report_status">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="xpad">5</property>
                       </object>
                       <packing>
@@ -179,7 +179,7 @@
                       <object class="GtkLabel" id="label70">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">1</property>
+                        <property name="halign">2</property>
                         <property name="xpad">3</property>
                         <property name="ypad">3</property>
                         <property name="label" translatable="yes">Author:</property>
@@ -195,7 +195,7 @@
                       <object class="GtkLabel" id="label71">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">1</property>
+                        <property name="halign">2</property>
                         <property name="xpad">3</property>
                         <property name="ypad">3</property>
                         <property name="label" translatable="yes">Author's email:</property>
@@ -211,7 +211,7 @@
                       <object class="GtkLabel" id="author_name">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="xpad">5</property>
                       </object>
                       <packing>
@@ -227,7 +227,7 @@
                       <object class="GtkLabel" id="author_email">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="xpad">5</property>
                       </object>
                       <packing>
diff --git a/gramps/gui/glade/reorder.glade b/gramps/gui/glade/reorder.glade
index 0468ff3dc..85d193c16 100644
--- a/gramps/gui/glade/reorder.glade
+++ b/gramps/gui/glade/reorder.glade
@@ -86,7 +86,7 @@
               <object class="GtkLabel" id="label665">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
+                <property name="halign">1</property>
                 <property name="label" translatable="yes">Parent relationships</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
@@ -202,7 +202,7 @@
               <object class="GtkLabel" id="label666">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
+                <property name="halign">1</property>
                 <property name="label" translatable="yes">Family relationships</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
diff --git a/gramps/gui/glade/rule.glade b/gramps/gui/glade/rule.glade
index 8075fed3c..f71ba2cde 100644
--- a/gramps/gui/glade/rule.glade
+++ b/gramps/gui/glade/rule.glade
@@ -544,7 +544,7 @@
                   <object class="GtkLabel" id="label16">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">Options</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
@@ -562,7 +562,7 @@
                   <object class="GtkLabel" id="label15">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">Rule list</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
@@ -580,7 +580,7 @@
                   <object class="GtkLabel" id="label14">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">Definition</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
@@ -596,7 +596,7 @@
                   <object class="GtkLabel" id="label10">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">Co_mment:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">comment</property>
@@ -636,7 +636,7 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">_Name:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">filter_name</property>
@@ -658,7 +658,7 @@
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
-                    <property name="xalign">0.5</property>
+                    <property name="halign">3</property>
                     <property name="draw_indicator">True</property>
                   </object>
                   <packing>
@@ -871,7 +871,7 @@
                       <object class="GtkLabel" id="label27">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="label" translatable="yes">Selected Rule</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
@@ -887,7 +887,7 @@
                       <object class="GtkLabel" id="rulename">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="xpad">12</property>
                         <property name="label" translatable="yes">No rule selected</property>
                         <property name="wrap">True</property>
@@ -903,7 +903,7 @@
                       <object class="GtkLabel" id="label25">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="label" translatable="yes">Description</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
@@ -919,8 +919,8 @@
                       <object class="GtkLabel" id="description">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="yalign">0</property>
+                        <property name="halign">1</property>
+                        <property name="valign">1</property>
                         <property name="xpad">12</property>
                         <property name="label" translatable="yes">No description</property>
                         <property name="wrap">True</property>
@@ -936,7 +936,7 @@
                       <object class="GtkLabel" id="label24">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="label" translatable="yes">Values</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
diff --git a/gramps/gui/glade/styleeditor.glade b/gramps/gui/glade/styleeditor.glade
index fb81bee9d..d4ff2a087 100644
--- a/gramps/gui/glade/styleeditor.glade
+++ b/gramps/gui/glade/styleeditor.glade
@@ -284,8 +284,8 @@
                           <object class="GtkLabel" id="label4">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
-                            <property name="yalign">0</property>
+                            <property name="halign">1</property>
+                            <property name="valign">1</property>
                             <property name="ypad">3</property>
                             <property name="label" translatable="yes">Type face</property>
                             <property name="justify">center</property>
@@ -307,7 +307,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -327,7 +327,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">roman</property>
                           </object>
@@ -344,7 +344,7 @@
                           <object class="GtkLabel" id="label5">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
+                            <property name="halign">1</property>
                             <property name="ypad">3</property>
                             <property name="label" translatable="yes">Size</property>
                             <property name="justify">center</property>
@@ -381,7 +381,7 @@
                           <object class="GtkLabel" id="label6">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
+                            <property name="halign">1</property>
                             <property name="label" translatable="yes">point size|pt</property>
                             <property name="justify">center</property>
                           </object>
@@ -398,7 +398,7 @@
                           <object class="GtkLabel" id="label8">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
+                            <property name="halign">1</property>
                             <property name="ypad">3</property>
                             <property name="label" translatable="yes">Color</property>
                             <property name="justify">center</property>
@@ -418,8 +418,8 @@
                           <object class="GtkLabel" id="label7">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
-                            <property name="yalign">0</property>
+                            <property name="halign">1</property>
+                            <property name="valign">1</property>
                             <property name="ypad">3</property>
                             <property name="label" translatable="yes">Options</property>
                             <property name="justify">center</property>
@@ -443,7 +443,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -463,7 +463,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -483,7 +483,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -499,7 +499,7 @@
                           <object class="GtkLabel" id="color_code">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="xalign">0</property>
+                            <property name="halign">1</property>
                             <property name="selectable">True</property>
                           </object>
                           <packing>
@@ -596,7 +596,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -616,7 +616,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">lalign</property>
                           </object>
@@ -637,7 +637,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">lalign</property>
                           </object>
@@ -658,7 +658,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">lalign</property>
                           </object>
@@ -675,8 +675,8 @@
                           <object class="GtkLabel" id="label9">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
-                            <property name="yalign">0</property>
+                            <property name="halign">1</property>
+                            <property name="valign">1</property>
                             <property name="ypad">3</property>
                             <property name="label" translatable="yes">Alignment</property>
                             <property name="justify">center</property>
@@ -694,7 +694,7 @@
                           <object class="GtkLabel" id="label10">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
+                            <property name="halign">1</property>
                             <property name="ypad">3</property>
                             <property name="label" translatable="yes">Background color</property>
                             <property name="justify">center</property>
@@ -714,7 +714,7 @@
                           <object class="GtkLabel" id="label13">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
+                            <property name="halign">1</property>
                             <property name="label" translatable="yes">First li_ne:</property>
                             <property name="use_underline">True</property>
                             <property name="justify">center</property>
@@ -733,7 +733,7 @@
                           <object class="GtkLabel" id="label15">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
+                            <property name="halign">1</property>
                             <property name="label" translatable="yes">cm</property>
                             <property name="justify">center</property>
                           </object>
@@ -750,7 +750,7 @@
                           <object class="GtkLabel" id="label16">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
+                            <property name="halign">1</property>
                             <property name="label" translatable="yes">cm</property>
                             <property name="justify">center</property>
                           </object>
@@ -767,7 +767,7 @@
                           <object class="GtkLabel" id="label17">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
+                            <property name="halign">1</property>
                             <property name="label" translatable="yes">cm</property>
                             <property name="justify">center</property>
                           </object>
@@ -784,7 +784,7 @@
                           <object class="GtkLabel" id="label11">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
+                            <property name="halign">1</property>
                             <property name="label" translatable="yes">R_ight:</property>
                             <property name="use_underline">True</property>
                             <property name="justify">center</property>
@@ -803,7 +803,7 @@
                           <object class="GtkLabel" id="label12">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
+                            <property name="halign">1</property>
                             <property name="label" translatable="yes">L_eft:</property>
                             <property name="use_underline">True</property>
                             <property name="justify">center</property>
@@ -822,8 +822,8 @@
                           <object class="GtkLabel" id="label26">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
-                            <property name="yalign">0</property>
+                            <property name="halign">1</property>
+                            <property name="valign">1</property>
                             <property name="ypad">3</property>
                             <property name="label" translatable="yes">Spacing</property>
                             <property name="justify">center</property>
@@ -843,7 +843,7 @@
                           <object class="GtkLabel" id="label28">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
+                            <property name="halign">1</property>
                             <property name="label" translatable="yes">Abo_ve:</property>
                             <property name="use_underline">True</property>
                             <property name="justify">center</property>
@@ -862,7 +862,7 @@
                           <object class="GtkLabel" id="label437">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
+                            <property name="halign">1</property>
                             <property name="label" translatable="yes">Belo_w:</property>
                             <property name="use_underline">True</property>
                             <property name="justify">center</property>
@@ -881,7 +881,7 @@
                           <object class="GtkLabel" id="label438">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
+                            <property name="halign">1</property>
                             <property name="label" translatable="yes">cm</property>
                             <property name="justify">center</property>
                           </object>
@@ -898,7 +898,7 @@
                           <object class="GtkLabel" id="label439">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
+                            <property name="halign">1</property>
                             <property name="label" translatable="yes">cm</property>
                             <property name="justify">center</property>
                           </object>
@@ -915,8 +915,8 @@
                           <object class="GtkLabel" id="label14">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
-                            <property name="yalign">0</property>
+                            <property name="halign">1</property>
+                            <property name="valign">1</property>
                             <property name="ypad">3</property>
                             <property name="label" translatable="yes">Borders</property>
                             <property name="justify">center</property>
@@ -1025,7 +1025,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -1045,7 +1045,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -1065,7 +1065,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -1081,7 +1081,7 @@
                           <object class="GtkLabel" id="label440">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
+                            <property name="halign">1</property>
                             <property name="label" translatable="yes">_Padding:</property>
                             <property name="use_underline">True</property>
                             <property name="justify">center</property>
@@ -1117,7 +1117,7 @@
                           <object class="GtkLabel" id="label27">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
+                            <property name="halign">1</property>
                             <property name="label" translatable="yes">cm</property>
                             <property name="justify">center</property>
                           </object>
@@ -1138,7 +1138,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -1154,7 +1154,7 @@
                           <object class="GtkLabel" id="bgcolor_code">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="xalign">0</property>
+                            <property name="halign">1</property>
                             <property name="selectable">True</property>
                           </object>
                           <packing>
@@ -1170,7 +1170,7 @@
                           <object class="GtkLabel" id="label24">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
+                            <property name="halign">1</property>
                             <property name="label" translatable="yes">Indentation</property>
                             <attributes>
                               <attribute name="weight" value="bold"/>
diff --git a/gramps/gui/glade/tipofday.glade b/gramps/gui/glade/tipofday.glade
index 82a2737e5..495a9afbc 100644
--- a/gramps/gui/glade/tipofday.glade
+++ b/gramps/gui/glade/tipofday.glade
@@ -27,8 +27,8 @@
                 <property name="receives_default">False</property>
                 <property name="halign">center</property>
                 <property name="use_underline">True</property>
-                <property name="xalign">0.5</property>
-                <property name="yalign">0</property>
+                <property name="halign">3</property>
+                <property name="valign">1</property>
                 <property name="active">True</property>
                 <property name="draw_indicator">True</property>
               </object>
@@ -61,8 +61,8 @@
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
                 <property name="vexpand">True</property>
-                <property name="xalign">0</property>
-                <property name="yalign">0</property>
+                <property name="halign">1</property>
+                <property name="valign">1</property>
                 <property name="xpad">6</property>
                 <property name="ypad">6</property>
                 <property name="wrap">True</property>
@@ -80,7 +80,7 @@
                 <property name="can_focus">False</property>
                 <property name="valign">start</property>
                 <property name="vexpand">True</property>
-                <property name="yalign">0</property>
+                <property name="valign">1</property>
                 <property name="stock">gtk-missing-image</property>
               </object>
               <packing>
diff --git a/gramps/plugins/export/exportcsv.glade b/gramps/plugins/export/exportcsv.glade
index cbb195b41..f7dac92b7 100644
--- a/gramps/plugins/export/exportcsv.glade
+++ b/gramps/plugins/export/exportcsv.glade
@@ -109,7 +109,7 @@
                       <object class="GtkLabel" id="label9">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="label" translatable="yes">Options</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
@@ -125,7 +125,7 @@
                       <object class="GtkLabel" id="label1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="label" translatable="yes">Filt_er:</property>
                         <property name="use_underline">True</property>
                       </object>
@@ -170,7 +170,7 @@
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="active">True</property>
                             <property name="draw_indicator">True</property>
                           </object>
@@ -192,7 +192,7 @@
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="active">True</property>
                             <property name="draw_indicator">True</property>
                           </object>
@@ -214,7 +214,7 @@
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="active">True</property>
                             <property name="draw_indicator">True</property>
                           </object>
@@ -244,7 +244,7 @@
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">3</property>
                             <property name="active">True</property>
                             <property name="draw_indicator">True</property>
                           </object>
@@ -270,7 +270,7 @@
                       <object class="GtkLabel" id="label10">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="label" translatable="yes">Export:</property>
                         <property name="use_underline">True</property>
                       </object>
diff --git a/gramps/plugins/export/exportftree.glade b/gramps/plugins/export/exportftree.glade
index 36f9bbeb7..4feac0825 100644
--- a/gramps/plugins/export/exportftree.glade
+++ b/gramps/plugins/export/exportftree.glade
@@ -115,7 +115,7 @@
                   <object class="GtkLabel" id="label9">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">Options</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
@@ -131,7 +131,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">Filt_er:</property>
                     <property name="use_underline">True</property>
                   </object>
@@ -153,7 +153,7 @@
                     <property name="receives_default">False</property>
                     <property name="use_action_appearance">False</property>
                     <property name="use_underline">True</property>
-                    <property name="xalign">0.5</property>
+                    <property name="halign">3</property>
                     <property name="active">True</property>
                     <property name="draw_indicator">True</property>
                   </object>
diff --git a/gramps/plugins/export/exportgeneweb.glade b/gramps/plugins/export/exportgeneweb.glade
index a222c26be..c0dfe8df9 100644
--- a/gramps/plugins/export/exportgeneweb.glade
+++ b/gramps/plugins/export/exportgeneweb.glade
@@ -117,7 +117,7 @@
                   <object class="GtkLabel" id="label9">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">Options</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
@@ -133,7 +133,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">Filt_er:</property>
                     <property name="use_underline">True</property>
                   </object>
@@ -156,7 +156,7 @@
                     <property name="border_width">3</property>
                     <property name="use_action_appearance">False</property>
                     <property name="use_underline">True</property>
-                    <property name="xalign">0.5</property>
+                    <property name="halign">3</property>
                     <property name="active">True</property>
                     <property name="draw_indicator">True</property>
                     <signal name="toggled" handler="on_restrict_toggled" swapped="no"/>
@@ -199,7 +199,7 @@
                         <property name="receives_default">False</property>
                         <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
-                        <property name="xalign">0.5</property>
+                        <property name="halign">3</property>
                         <property name="active">True</property>
                         <property name="draw_indicator">True</property>
                       </object>
@@ -221,7 +221,7 @@
                         <property name="receives_default">False</property>
                         <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
-                        <property name="xalign">0.5</property>
+                        <property name="halign">3</property>
                         <property name="active">True</property>
                         <property name="draw_indicator">True</property>
                       </object>
@@ -264,7 +264,7 @@
                         <property name="receives_default">False</property>
                         <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
-                        <property name="xalign">0.5</property>
+                        <property name="halign">3</property>
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
diff --git a/gramps/plugins/export/exportvcalendar.glade b/gramps/plugins/export/exportvcalendar.glade
index 5462be56a..d08fd4e85 100644
--- a/gramps/plugins/export/exportvcalendar.glade
+++ b/gramps/plugins/export/exportvcalendar.glade
@@ -96,7 +96,7 @@
                   <object class="GtkLabel" id="label9">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">Options</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
@@ -112,7 +112,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">Filt_er:</property>
                     <property name="use_underline">True</property>
                   </object>
diff --git a/gramps/plugins/export/exportvcard.glade b/gramps/plugins/export/exportvcard.glade
index 6c82c5ff9..80c14e91e 100644
--- a/gramps/plugins/export/exportvcard.glade
+++ b/gramps/plugins/export/exportvcard.glade
@@ -105,7 +105,7 @@
                   <object class="GtkLabel" id="label9">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">Options</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
@@ -121,7 +121,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">Filt_er:</property>
                     <property name="use_underline">True</property>
                   </object>
diff --git a/gramps/plugins/importer/importgedcom.glade b/gramps/plugins/importer/importgedcom.glade
index 1c3014a53..0a31b05af 100644
--- a/gramps/plugins/importer/importgedcom.glade
+++ b/gramps/plugins/importer/importgedcom.glade
@@ -230,7 +230,7 @@
                   <object class="GtkLabel" id="label16">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">Warning messages</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
@@ -282,7 +282,7 @@
                       <object class="GtkLabel" id="label6">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="label" translatable="yes">File:</property>
                         <property name="justify">center</property>
                       </object>
@@ -297,7 +297,7 @@
                       <object class="GtkLabel" id="label7">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="label" translatable="yes">Created by:</property>
                         <property name="justify">center</property>
                       </object>
@@ -314,7 +314,7 @@
                       <object class="GtkLabel" id="label10">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="label" translatable="yes">People:</property>
                         <property name="justify">center</property>
                       </object>
@@ -371,7 +371,7 @@
                       <object class="GtkLabel" id="label12">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="label" translatable="yes">Encoding:</property>
                         <property name="justify">center</property>
                       </object>
@@ -386,7 +386,7 @@
                       <object class="GtkLabel" id="label8">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="label" translatable="yes">Version:</property>
                         <property name="justify">center</property>
                       </object>
@@ -403,7 +403,7 @@
                       <object class="GtkLabel" id="label9">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="label" translatable="yes">Families:</property>
                         <property name="justify">center</property>
                       </object>
diff --git a/gramps/plugins/tool/changetypes.glade b/gramps/plugins/tool/changetypes.glade
index a7b5a5d96..e9a2eb821 100644
--- a/gramps/plugins/tool/changetypes.glade
+++ b/gramps/plugins/tool/changetypes.glade
@@ -106,7 +106,7 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">_Original event type:</property>
                     <property name="use_underline">True</property>
                   </object>
@@ -119,7 +119,7 @@
                   <object class="GtkLabel" id="label3">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">_New event type:</property>
                     <property name="use_underline">True</property>
                   </object>
diff --git a/gramps/plugins/tool/eventcmp.glade b/gramps/plugins/tool/eventcmp.glade
index 1df945c2b..3152a861a 100644
--- a/gramps/plugins/tool/eventcmp.glade
+++ b/gramps/plugins/tool/eventcmp.glade
@@ -228,7 +228,7 @@
               <object class="GtkLabel" id="label8">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">1</property>
+                <property name="halign">2</property>
                 <property name="xpad">5</property>
                 <property name="label" translatable="yes">_Filter:</property>
                 <property name="use_underline">True</property>
diff --git a/gramps/plugins/tool/finddupes.glade b/gramps/plugins/tool/finddupes.glade
index 3a5345497..0ced34f38 100644
--- a/gramps/plugins/tool/finddupes.glade
+++ b/gramps/plugins/tool/finddupes.glade
@@ -122,7 +122,7 @@
                   <object class="GtkLabel" id="label62">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">Match Threshold</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
@@ -138,7 +138,7 @@
                   <object class="GtkLabel" id="label63">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">Options</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
@@ -161,7 +161,7 @@
                     <property name="receives_default">False</property>
                     <property name="use_action_appearance">False</property>
                     <property name="use_underline">True</property>
-                    <property name="xalign">0.5</property>
+                    <property name="halign">3</property>
                     <property name="active">True</property>
                     <property name="draw_indicator">True</property>
                   </object>
diff --git a/gramps/plugins/tool/mergecitations.glade b/gramps/plugins/tool/mergecitations.glade
index 7982834d8..5d7476e44 100644
--- a/gramps/plugins/tool/mergecitations.glade
+++ b/gramps/plugins/tool/mergecitations.glade
@@ -128,7 +128,7 @@
                   <object class="GtkLabel" id="label62">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">Match Threshold</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
@@ -144,7 +144,7 @@
                   <object class="GtkLabel" id="label63">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">Options</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
@@ -167,7 +167,7 @@
                     <property name="receives_default">False</property>
                     <property name="use_action_appearance">False</property>
                     <property name="use_underline">True</property>
-                    <property name="xalign">0.5</property>
+                    <property name="halign">3</property>
                     <property name="active">True</property>
                     <property name="draw_indicator">True</property>
                   </object>
diff --git a/gramps/plugins/tool/ownereditor.glade b/gramps/plugins/tool/ownereditor.glade
index 67f167af6..84392a13c 100644
--- a/gramps/plugins/tool/ownereditor.glade
+++ b/gramps/plugins/tool/ownereditor.glade
@@ -122,7 +122,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">_Name:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">name</property>
@@ -136,7 +136,7 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">_Street:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">address</property>
@@ -152,7 +152,7 @@
                   <object class="GtkLabel" id="label3">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">_City:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">city</property>
@@ -168,7 +168,7 @@
                   <object class="GtkLabel" id="label4">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">_State/County:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">state</property>
@@ -184,7 +184,7 @@
                   <object class="GtkLabel" id="label5">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">_Country:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">country</property>
@@ -200,7 +200,7 @@
                   <object class="GtkLabel" id="label6">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">_ZIP/Postal Code:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">zip</property>
@@ -216,7 +216,7 @@
                   <object class="GtkLabel" id="label7">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">_Phone:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">phone</property>
@@ -232,7 +232,7 @@
                   <object class="GtkLabel" id="label8">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">_Email:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">email</property>
@@ -358,7 +358,7 @@
                   <object class="GtkLabel" id="label9">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">_Locality:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">locality</property>
diff --git a/gramps/plugins/tool/patchnames.glade b/gramps/plugins/tool/patchnames.glade
index 6ea6da50b..3b97eb0b8 100644
--- a/gramps/plugins/tool/patchnames.glade
+++ b/gramps/plugins/tool/patchnames.glade
@@ -138,7 +138,7 @@
               <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
+                <property name="halign">1</property>
                 <property name="ypad">10</property>
                 <property name="label" translatable="yes">Below is a list of the nicknames, titles, prefixes and compound surnames that Gramps can extract from the Family Tree.
 If you accept the changes, Gramps will modify the entries that have been selected.
diff --git a/gramps/plugins/tool/phpgedview.glade b/gramps/plugins/tool/phpgedview.glade
index 3adc147d4..2dae1c8f9 100644
--- a/gramps/plugins/tool/phpgedview.glade
+++ b/gramps/plugins/tool/phpgedview.glade
@@ -169,7 +169,7 @@
               <object class="GtkLabel" id="label10">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
+                <property name="halign">1</property>
                 <property name="label" translatable="yes">File:</property>
               </object>
               <packing>
@@ -184,7 +184,7 @@
               <object class="GtkLabel" id="label11">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
+                <property name="halign">1</property>
                 <property name="label" translatable="yes">Username:</property>
               </object>
               <packing>
@@ -199,7 +199,7 @@
               <object class="GtkLabel" id="label12">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
+                <property name="halign">1</property>
                 <property name="label" translatable="yes">Password:</property>
               </object>
               <packing>
@@ -214,7 +214,7 @@
               <object class="GtkLabel" id="version_label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
+                <property name="halign">1</property>
               </object>
               <packing>
                 <property name="right_attach">2</property>
@@ -229,7 +229,7 @@
               <object class="GtkLabel" id="label7">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
+                <property name="halign">1</property>
                 <property name="label" translatable="yes">URL:</property>
               </object>
               <packing>
diff --git a/gramps/plugins/tool/removeunused.glade b/gramps/plugins/tool/removeunused.glade
index 68d7ee94e..ef009ae9d 100644
--- a/gramps/plugins/tool/removeunused.glade
+++ b/gramps/plugins/tool/removeunused.glade
@@ -98,7 +98,7 @@
                         <property name="receives_default">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="use_action_appearance">False</property>
-                        <property name="xalign">0.5</property>
+                        <property name="halign">3</property>
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
@@ -116,7 +116,7 @@
                         <property name="receives_default">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="use_action_appearance">False</property>
-                        <property name="xalign">0.5</property>
+                        <property name="halign">3</property>
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
@@ -134,7 +134,7 @@
                         <property name="receives_default">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="use_action_appearance">False</property>
-                        <property name="xalign">0.5</property>
+                        <property name="halign">3</property>
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
@@ -152,7 +152,7 @@
                         <property name="receives_default">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="use_action_appearance">False</property>
-                        <property name="xalign">0.5</property>
+                        <property name="halign">3</property>
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
@@ -170,7 +170,7 @@
                         <property name="receives_default">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="use_action_appearance">False</property>
-                        <property name="xalign">0.5</property>
+                        <property name="halign">3</property>
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
@@ -188,7 +188,7 @@
                         <property name="receives_default">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="use_action_appearance">False</property>
-                        <property name="xalign">0.5</property>
+                        <property name="halign">3</property>
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
diff --git a/gramps/plugins/tool/verify.glade b/gramps/plugins/tool/verify.glade
index b4b70434c..57ba41125 100644
--- a/gramps/plugins/tool/verify.glade
+++ b/gramps/plugins/tool/verify.glade
@@ -214,7 +214,7 @@
                       <object class="GtkLabel" id="label1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="label" translatable="yes">Maximum _age</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">oldage</property>
@@ -227,7 +227,7 @@
                       <object class="GtkLabel" id="label3">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="label" translatable="yes">Mi_nimum age to marry</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">yngmar</property>
@@ -258,7 +258,7 @@
                       <object class="GtkLabel" id="label11">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="label" translatable="yes">Ma_ximum age to marry</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">oldmar</property>
@@ -289,7 +289,7 @@
                       <object class="GtkLabel" id="label4">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="label" translatable="yes">Maximum number of _spouses for a person</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">wedder</property>
@@ -337,7 +337,7 @@
                       <object class="GtkLabel" id="label5">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="label" translatable="yes">Maximum number of consecutive years of _widowhood before next marriage</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">lngwdw</property>
@@ -352,7 +352,7 @@
                       <object class="GtkLabel" id="label26">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="label" translatable="yes">Maximum age for an _unmarried person</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">oldunm</property>
@@ -388,7 +388,7 @@
                         <property name="receives_default">False</property>
                         <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
-                        <property name="xalign">0.5</property>
+                        <property name="halign">3</property>
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
@@ -407,7 +407,7 @@
                         <property name="receives_default">False</property>
                         <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
-                        <property name="xalign">0.5</property>
+                        <property name="halign">3</property>
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
@@ -423,7 +423,7 @@
                   <object class="GtkLabel" id="label24">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">General</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
@@ -446,7 +446,7 @@
                       <object class="GtkLabel" id="label7">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="xpad">2</property>
                         <property name="ypad">2</property>
                         <property name="label" translatable="yes">Mi_nimum age to bear a child</property>
@@ -461,7 +461,7 @@
                       <object class="GtkLabel" id="label8">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="xpad">2</property>
                         <property name="ypad">2</property>
                         <property name="label" translatable="yes">Ma_ximum age to bear a child</property>
@@ -478,7 +478,7 @@
                       <object class="GtkLabel" id="label12">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="xpad">2</property>
                         <property name="ypad">2</property>
                         <property name="label" translatable="yes">Maximum number of chil_dren</property>
@@ -546,7 +546,7 @@
                   <object class="GtkLabel" id="label19">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">Women</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
@@ -570,7 +570,7 @@
                       <object class="GtkLabel" id="label9">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="xpad">2</property>
                         <property name="ypad">2</property>
                         <property name="label" translatable="yes">Mi_nimum age to father a child</property>
@@ -585,7 +585,7 @@
                       <object class="GtkLabel" id="label10">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="xpad">2</property>
                         <property name="ypad">2</property>
                         <property name="label" translatable="yes">Ma_ximum age to father a child</property>
@@ -602,7 +602,7 @@
                       <object class="GtkLabel" id="label13">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="xpad">2</property>
                         <property name="ypad">2</property>
                         <property name="label" translatable="yes">Maximum number of chil_dren</property>
@@ -670,7 +670,7 @@
                   <object class="GtkLabel" id="label20">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">Men</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
@@ -740,7 +740,7 @@
                       <object class="GtkLabel" id="label2">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="label" translatable="yes">Maximum husband-wife age _difference</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">hwdif</property>
@@ -753,7 +753,7 @@
                       <object class="GtkLabel" id="label6">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="label" translatable="yes">Maximum number of years _between children</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">cspace</property>
@@ -768,7 +768,7 @@
                       <object class="GtkLabel" id="label14">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">1</property>
                         <property name="label" translatable="yes">Maximum _span of years for all children</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">cbspan</property>
@@ -788,7 +788,7 @@
                   <object class="GtkLabel" id="label25">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">1</property>
                     <property name="label" translatable="yes">Families</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>