diff --git a/src/business/business-gnome/dialog-date-close.c b/src/business/business-gnome/dialog-date-close.c
index e8a0ffe703..2576588787 100644
--- a/src/business/business-gnome/dialog-date-close.c
+++ b/src/business/business-gnome/dialog-date-close.c
@@ -137,8 +137,8 @@ gnc_dialog_date_close_parented (GtkWidget *parent, const char *message,
     ddc->ts = ts;
 
     builder = gtk_builder_new();
-    gnc_builder_add_from_file (builder, "dialog-date-close.glade", "Date Close Dialog");
-    ddc->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "Date Close Dialog"));
+    gnc_builder_add_from_file (builder, "dialog-date-close.glade", "date_close_dialog");
+    ddc->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "date_close_dialog"));
 
     date_box = GTK_WIDGET(gtk_builder_get_object (builder, "date_box"));
     ddc->date = gnc_date_edit_new (time(NULL), FALSE, FALSE);
@@ -227,8 +227,8 @@ gnc_dialog_dates_acct_question_parented (GtkWidget *parent, const char *message,
     ddc->terms = terms;
 
     builder = gtk_builder_new();
-    gnc_builder_add_from_file (builder, "dialog-date-close.glade", "Date Account Dialog");
-    ddc->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "Date Account Dialog"));
+    gnc_builder_add_from_file (builder, "dialog-date-close.glade", "date_account_dialog");
+    ddc->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "date_account_dialog"));
     ddc->memo_entry = GTK_WIDGET(gtk_builder_get_object (builder, "memo_entry"));
 
     acct_box = GTK_WIDGET(gtk_builder_get_object (builder, "acct_hbox"));
@@ -343,8 +343,8 @@ gnc_dialog_date_acct_parented (GtkWidget *parent, const char *message,
     ddc->acct = *acct;
 
     builder = gtk_builder_new();
-    gnc_builder_add_from_file (builder, "dialog-date-close.glade", "Date Account Dialog");
-    ddc->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "Date Account Dialog"));
+    gnc_builder_add_from_file (builder, "dialog-date-close.glade", "date_account_dialog");
+    ddc->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "date_account_dialog"));
 
     acct_box = GTK_WIDGET(gtk_builder_get_object (builder, "acct_hbox"));
     ddc->acct_combo = gnc_account_sel_new();
diff --git a/src/business/business-gnome/gtkbuilder/dialog-date-close.glade b/src/business/business-gnome/gtkbuilder/dialog-date-close.glade
index 45072f24c2..169b0731e2 100644
--- a/src/business/business-gnome/gtkbuilder/dialog-date-close.glade
+++ b/src/business/business-gnome/gtkbuilder/dialog-date-close.glade
@@ -1,31 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
 <interface>
-  <requires lib="gtk+" version="2.16"/>
-  <object class="GtkDialog" id="Date Account Dialog">
+  <requires lib="gtk+" version="3.10"/>
+  <object class="GtkDialog" id="date_account_dialog">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Question</property>
     <property name="modal">True</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox6">
+      <object class="GtkBox" id="dialog-vbox6">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
         <property name="spacing">8</property>
         <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area6">
+          <object class="GtkButtonBox" id="dialog-action_area6">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="cancelbutton1">
-                <property name="label">gtk-cancel</property>
+                <property name="label" translatable="yes">_Cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -35,14 +36,13 @@
             </child>
             <child>
               <object class="GtkButton" id="okbutton1">
-                <property name="label">gtk-ok</property>
+                <property name="label" translatable="yes">_OK</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="has_default">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
                 <signal name="clicked" handler="gnc_dialog_date_close_ok_cb" swapped="no"/>
               </object>
               <packing>
@@ -60,11 +60,12 @@
           </packing>
         </child>
         <child>
-          <object class="GtkVBox" id="vbox3">
+          <object class="GtkBox" id="vbox3">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="orientation">vertical</property>
             <child>
-              <object class="GtkHBox" id="the_top_hbox">
+              <object class="GtkBox" id="the_top_hbox">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="border_width">3</property>
@@ -72,7 +73,6 @@
                   <object class="GtkImage" id="image2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xpad">8</property>
                     <property name="stock">gtk-dialog-question</property>
                   </object>
                   <packing>
@@ -85,8 +85,7 @@
                   <object class="GtkLabel" id="top_msg_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xpad">8</property>
-                    <property name="label" translatable="no">Dummy message</property>
+                    <property name="label">Dummy message</property>
                   </object>
                   <packing>
                     <property name="expand">True</property>
@@ -102,7 +101,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkHBox" id="hbox4">
+              <object class="GtkBox" id="hbox4">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="border_width">3</property>
@@ -119,16 +118,17 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkVBox" id="vbox4">
+                  <object class="GtkBox" id="vbox4">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="orientation">vertical</property>
                     <property name="homogeneous">True</property>
                     <child>
                       <object class="GtkLabel" id="postdate_label">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">1</property>
-                        <property name="label" translatable="no">postdate</property>
+                        <property name="halign">end</property>
+                        <property name="label">postd</property>
                         <property name="justify">right</property>
                       </object>
                       <packing>
@@ -141,8 +141,8 @@
                       <object class="GtkLabel" id="date_label">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">1</property>
-                        <property name="label" translatable="no">duedate</property>
+                        <property name="halign">end</property>
+                        <property name="label">duedate</property>
                         <property name="justify">right</property>
                       </object>
                       <packing>
@@ -155,8 +155,8 @@
                       <object class="GtkLabel" id="memo_label">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">1</property>
-                        <property name="label" translatable="Yes">Description</property>
+                        <property name="halign">end</property>
+                        <property name="label" translatable="yes">Description</property>
                         <property name="justify">right</property>
                       </object>
                       <packing>
@@ -169,8 +169,8 @@
                       <object class="GtkLabel" id="acct_label">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">1</property>
-                        <property name="label" translatable="no">acct</property>
+                        <property name="halign">end</property>
+                        <property name="label">acct</property>
                         <property name="justify">right</property>
                       </object>
                       <packing>
@@ -199,12 +199,13 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkVBox" id="vbox5">
+                  <object class="GtkBox" id="vbox5">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="orientation">vertical</property>
                     <property name="homogeneous">True</property>
                     <child>
-                      <object class="GtkHBox" id="post_date_box">
+                      <object class="GtkBox" id="post_date_box">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
@@ -218,7 +219,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkHBox" id="date_hbox">
+                      <object class="GtkBox" id="date_hbox">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
@@ -235,12 +236,9 @@
                       <object class="GtkEntry" id="memo_entry">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="invisible_char">&#x25CF;</property>
-                        <property name="invisible_char_set">True</property>
+                        <property name="invisible_char">●</property>
                         <property name="primary_icon_activatable">False</property>
                         <property name="secondary_icon_activatable">False</property>
-                        <property name="primary_icon_sensitive">True</property>
-                        <property name="secondary_icon_sensitive">True</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -249,7 +247,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkHBox" id="acct_hbox">
+                      <object class="GtkBox" id="acct_hbox">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
@@ -264,11 +262,11 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="question_check">
-                        <property name="label" translatable="no">question</property>
+                        <property name="label">question</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="use_action_appearance">False</property>
+                        <property name="halign">start</property>
                         <property name="use_underline">True</property>
                         <property name="draw_indicator">True</property>
                       </object>
@@ -319,31 +317,31 @@
       <action-widget response="-5">okbutton1</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkDialog" id="Date Close Dialog">
+  <object class="GtkDialog" id="date_close_dialog">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Question</property>
     <property name="modal">True</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox4">
+      <object class="GtkBox" id="dialog-vbox4">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
         <property name="spacing">8</property>
         <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area4">
+          <object class="GtkButtonBox" id="dialog-action_area4">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="cancelbutton">
-                <property name="label">gtk-cancel</property>
+                <property name="label" translatable="yes">_Cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
                 <signal name="clicked" handler="gnc_dialog_date_close_cancel_cb" swapped="no"/>
               </object>
               <packing>
@@ -354,14 +352,13 @@
             </child>
             <child>
               <object class="GtkButton" id="okbutton">
-                <property name="label">gtk-ok</property>
+                <property name="label" translatable="yes">_OK</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="has_default">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
                 <signal name="clicked" handler="gnc_dialog_date_close_ok_cb" swapped="no"/>
               </object>
               <packing>
@@ -379,11 +376,12 @@
           </packing>
         </child>
         <child>
-          <object class="GtkVBox" id="vbox1">
+          <object class="GtkBox" id="vbox1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="orientation">vertical</property>
             <child>
-              <object class="GtkHBox" id="the_hbox">
+              <object class="GtkBox" id="the_hbox">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="border_width">3</property>
@@ -391,7 +389,6 @@
                   <object class="GtkImage" id="image1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xpad">8</property>
                     <property name="stock">gtk-dialog-question</property>
                   </object>
                   <packing>
@@ -404,8 +401,7 @@
                   <object class="GtkLabel" id="msg_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xpad">8</property>
-                    <property name="label" translatable="no">Dummy message</property>
+                    <property name="label">Dummy message</property>
                   </object>
                   <packing>
                     <property name="expand">True</property>
@@ -416,14 +412,15 @@
               </object>
               <packing>
                 <property name="expand">True</property>
-                <property name="fill">True</property>
+                <property name="fill">False</property>
                 <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkHBox" id="hbox2">
+              <object class="GtkBox" id="hbox2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="valign">start</property>
                 <property name="border_width">3</property>
                 <child>
                   <object class="GtkLabel" id="label1">
@@ -441,8 +438,7 @@
                   <object class="GtkLabel" id="label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">1</property>
-                    <property name="label" translatable="no">label</property>
+                    <property name="label">label</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -452,7 +448,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkHBox" id="date_box">
+                  <object class="GtkBox" id="date_box">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <child>
@@ -481,13 +477,13 @@
               </object>
               <packing>
                 <property name="expand">True</property>
-                <property name="fill">True</property>
+                <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="expand">True</property>
+            <property name="expand">False</property>
             <property name="fill">True</property>
             <property name="position">2</property>
           </packing>