diff --git a/src/glade/editperson.glade b/src/glade/editperson.glade
index 5b56f19f3..742c03a8e 100644
--- a/src/glade/editperson.glade
+++ b/src/glade/editperson.glade
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <interface>
   <!-- interface-requires gtk+ 2.12 -->
   <!-- interface-requires grampswidgets 0.0 -->
@@ -51,7 +51,7 @@
                         <property name="can_default">True</property>
                         <property name="has_default">True</property>
                         <property name="tooltip_text" translatable="yes">The person's given names</property>
-                        <property name="invisible_char">●</property>
+                        <property name="invisible_char">&#x25CF;</property>
                         <signal name="focus_out_event" handler="on_given_focus_out"/>
                       </object>
                       <packing>
@@ -89,7 +89,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="tooltip_text" translatable="yes">Part of the Given name that is the normally used name.</property>
-                        <property name="invisible_char">●</property>
+                        <property name="invisible_char">&#x25CF;</property>
                       </object>
                       <packing>
                         <property name="left_attach">7</property>
@@ -126,7 +126,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="tooltip_text" translatable="yes">A title used to refer to the person, such as 'Dr.' or 'Rev.'</property>
-                        <property name="invisible_char">●</property>
+                        <property name="invisible_char">&#x25CF;</property>
                       </object>
                       <packing>
                         <property name="left_attach">2</property>
@@ -145,7 +145,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="tooltip_text" translatable="yes">An optional suffix to the name, such as "Jr." or "III"</property>
-                        <property name="invisible_char">●</property>
+                        <property name="invisible_char">&#x25CF;</property>
                       </object>
                       <packing>
                         <property name="left_attach">7</property>
@@ -180,7 +180,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="tooltip_text" translatable="yes">A descriptive name given in place of or in addition to the official given name.</property>
-                        <property name="invisible_char">●</property>
+                        <property name="invisible_char">&#x25CF;</property>
                       </object>
                       <packing>
                         <property name="left_attach">4</property>
@@ -219,7 +219,7 @@
                       <packing>
                         <property name="bottom_attach">4</property>
                         <property name="x_options"></property>
-                        <property name="y_options">GTK_FILL</property>
+                        <property name="y_options"></property>
                         <property name="x_padding">3</property>
                       </packing>
                     </child>
@@ -262,6 +262,7 @@
                     </child>
                     <child>
                       <object class="GtkHBox" id="hboxmultsurnames">
+                        <property name="height_request">150</property>
                         <property name="visible">True</property>
                         <property name="tooltip_text" translatable="yes">Click on a table cell to edit.</property>
                         <child>
@@ -276,7 +277,6 @@
                         <property name="top_attach">6</property>
                         <property name="bottom_attach">7</property>
                         <property name="x_options">GTK_FILL</property>
-                        <property name="y_options">GTK_EXPAND | GTK_SHRINK</property>
                         <property name="x_padding">6</property>
                         <property name="y_padding">3</property>
                       </packing>
@@ -287,7 +287,7 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="tooltip_text" translatable="yes">Use Multiple Surnames
-Indicate that the surname consists of different parts. Every surname has its own prefix and a possible connector to the next surname. Eg., the surname Ramón y Cajal can be stored as Ramón, which is inherited from the father, the connector y, and Cajal, which is inherited from the mother.</property>
+Indicate that the surname consists of different parts. Every surname has its own prefix and a possible connector to the next surname. Eg., the surname Ram&#xF3;n y Cajal can be stored as Ram&#xF3;n, which is inherited from the father, the connector y, and Cajal, which is inherited from the mother.</property>
                         <property name="image">image2</property>
                         <property name="use_underline">True</property>
                       </object>
@@ -355,7 +355,7 @@ Indicate that the surname consists of different parts. Every surname has its own
                         <property name="top_attach">7</property>
                         <property name="bottom_attach">8</property>
                         <property name="x_options">GTK_FILL</property>
-                        <property name="y_options">GTK_FILL</property>
+                        <property name="y_options"></property>
                         <property name="y_padding">3</property>
                       </packing>
                     </child>
@@ -382,6 +382,7 @@ Indicate that the surname consists of different parts. Every surname has its own
                         <property name="left_attach">1</property>
                         <property name="right_attach">5</property>
                         <property name="x_options">GTK_FILL</property>
+                        <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
@@ -407,7 +408,7 @@ Indicate that the surname consists of different parts. Every surname has its own
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="tooltip_text" translatable="yes">An optional prefix for the family that is not used in sorting, such as "de" or "van".</property>
-                            <property name="invisible_char">●</property>
+                            <property name="invisible_char">&#x25CF;</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -420,7 +421,7 @@ Indicate that the surname consists of different parts. Every surname has its own
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="tooltip_text" translatable="yes">Part of a person's name indicating the family to which the person belongs</property>
-                            <property name="invisible_char">●</property>
+                            <property name="invisible_char">&#x25CF;</property>
                           </object>
                           <packing>
                             <property name="position">2</property>
@@ -431,6 +432,7 @@ Indicate that the surname consists of different parts. Every surname has its own
                         <property name="right_attach">6</property>
                         <property name="top_attach">4</property>
                         <property name="bottom_attach">5</property>
+                        <property name="y_options"></property>
                         <property name="x_padding">3</property>
                         <property name="y_padding">3</property>
                       </packing>
@@ -449,7 +451,7 @@ Indicate that the surname consists of different parts. Every surname has its own
                         <property name="right_attach">6</property>
                         <property name="top_attach">1</property>
                         <property name="bottom_attach">2</property>
-                        <property name="y_options">GTK_FILL</property>
+                        <property name="y_options"></property>
                         <property name="x_padding">3</property>
                       </packing>
                     </child>
@@ -560,7 +562,7 @@ Indicate that the surname consists of different parts. Every surname has its own
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="tooltip_text" translatable="yes">A unique ID for the person.</property>
-                            <property name="invisible_char">●</property>
+                            <property name="invisible_char">&#x25CF;</property>
                             <property name="width_chars">6</property>
                           </object>
                           <packing>
@@ -607,7 +609,7 @@ Indicate that the surname consists of different parts. Every surname has its own
                         <property name="right_attach">9</property>
                         <property name="top_attach">8</property>
                         <property name="bottom_attach">9</property>
-                        <property name="y_options">GTK_FILL</property>
+                        <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>