diff --git a/src/glade/dateedit.glade b/src/glade/dateedit.glade
index 9e3333d4d..6f74abd4b 100644
--- a/src/glade/dateedit.glade
+++ b/src/glade/dateedit.glade
@@ -25,23 +25,110 @@
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
+  <object class="GtkListStore" id="calendar_model">
+    <columns>
+      <!-- column-name gchararray1 -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
   <object class="GtkDialog" id="dateedit">
+    <property name="can_focus">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="vbox86">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <child>
+          <object class="GtkStatusbar" id="statusbar">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="spacing">2</property>
+            <property name="has_resize_grip">False</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="hbuttonbox36">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="button174">
+                <property name="label">gtk-help</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="button175">
+                <property name="label">gtk-cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="ok_button">
+                <property name="label">gtk-ok</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
         <child>
           <object class="GtkVBox" id="vbox87">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <child>
               <object class="GtkVBox" id="vbox88">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <child>
                   <object class="GtkHBox" id="hbox95">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <child>
                       <object class="GtkLabel" id="label404">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="xalign">0</property>
                         <property name="label" translatable="yes">Calenda_r:</property>
                         <property name="use_underline">True</property>
@@ -49,6 +136,7 @@
                       </object>
                       <packing>
                         <property name="expand">False</property>
+                        <property name="fill">True</property>
                         <property name="padding">6</property>
                         <property name="position">0</property>
                       </packing>
@@ -56,6 +144,7 @@
                     <child>
                       <object class="GtkComboBox" id="calendar_box">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="model">calendar_model</property>
                         <child>
                           <object class="GtkCellRendererText" id="cellrenderertext1"/>
@@ -65,6 +154,8 @@
                         </child>
                       </object>
                       <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
                         <property name="padding">6</property>
                         <property name="position">1</property>
                       </packing>
@@ -72,6 +163,7 @@
                   </object>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="fill">True</property>
                     <property name="padding">6</property>
                     <property name="position">0</property>
                   </packing>
@@ -79,9 +171,11 @@
                 <child>
                   <object class="GtkHBox" id="hbox145">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <child>
                       <object class="GtkLabel" id="label718">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -97,6 +191,7 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <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="draw_indicator">True</property>
                       </object>
@@ -109,6 +204,7 @@
                     <child>
                       <object class="GtkLabel" id="label717">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="xalign">1</property>
                         <property name="label" translatable="yes">Ne_w year begins:  </property>
                         <property name="use_underline">True</property>
@@ -116,21 +212,32 @@
                         <property name="mnemonic_widget">newyear</property>
                       </object>
                       <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
                         <property name="position">2</property>
                       </packing>
                     </child>
                     <child>
                       <object class="UndoableEntry" id="newyear">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="tooltip_text" translatable="yes">Month-Day of first day of new year (e.g., "1-1", "3-1", "3-25")</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>
                         <accelerator key="w" signal="grab_focus" modifiers="GDK_MOD1_MASK"/>
                       </object>
                       <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
                         <property name="position">3</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="padding">6</property>
                     <property name="position">1</property>
                   </packing>
@@ -138,6 +245,7 @@
                 <child>
                   <object class="GtkTable" id="table48">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="n_rows">5</property>
                     <property name="n_columns">8</property>
                     <property name="column_spacing">6</property>
@@ -145,6 +253,7 @@
                     <child>
                       <object class="GtkLabel" id="label413">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="xalign">0</property>
                         <property name="xpad">6</property>
                         <property name="label" translatable="yes">&lt;b&gt;Q_uality&lt;/b&gt;</property>
@@ -161,6 +270,7 @@
                     <child>
                       <object class="GtkComboBox" id="quality_box">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="model">quality_model</property>
                         <child>
                           <object class="GtkCellRendererText" id="cellrenderertext2"/>
@@ -183,6 +293,7 @@
                     <child>
                       <object class="GtkLabel" id="label414">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="xalign">0</property>
                         <property name="xpad">6</property>
                         <property name="label" translatable="yes">&lt;b&gt;_Type&lt;/b&gt;</property>
@@ -200,6 +311,7 @@
                     <child>
                       <object class="GtkComboBox" id="type_box">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="model">type_model</property>
                         <child>
                           <object class="GtkCellRendererText" id="cellrenderertext3"/>
@@ -222,6 +334,7 @@
                     <child>
                       <object class="GtkLabel" id="label411">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="xalign">0</property>
                         <property name="xpad">6</property>
                         <property name="label" translatable="yes">&lt;b&gt;Date&lt;/b&gt;</property>
@@ -238,6 +351,7 @@
                     <child>
                       <object class="GtkLabel" id="label410">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">_Day</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">start_day</property>
@@ -254,6 +368,7 @@
                     <child>
                       <object class="GtkLabel" id="label409">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">_Month</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">start_month_box</property>
@@ -270,6 +385,7 @@
                     <child>
                       <object class="GtkLabel" id="label408">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">_Year</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">start_year</property>
@@ -287,6 +403,10 @@
                       <object class="GtkSpinButton" id="start_day">
                         <property name="visible">True</property>
                         <property name="can_focus">True</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>
                         <property name="adjustment">adjustment1</property>
                         <property name="climb_rate">1</property>
                         <property name="numeric">True</property>
@@ -303,6 +423,7 @@
                     <child>
                       <object class="GtkComboBox" id="start_month_box">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="model">month_model1</property>
                         <child>
                           <object class="GtkCellRendererText" id="cellrenderertext4"/>
@@ -324,6 +445,10 @@
                       <object class="GtkSpinButton" id="start_year">
                         <property name="visible">True</property>
                         <property name="can_focus">True</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>
                         <property name="adjustment">adjustment2</property>
                         <property name="climb_rate">1</property>
                         <property name="numeric">True</property>
@@ -340,6 +465,7 @@
                     <child>
                       <object class="GtkLabel" id="label412">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="xalign">0</property>
                         <property name="xpad">6</property>
                         <property name="label" translatable="yes">&lt;b&gt;Second date&lt;/b&gt;</property>
@@ -357,6 +483,7 @@
                     <child>
                       <object class="GtkLabel" id="label407">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">D_ay</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">stop_day</property>
@@ -373,6 +500,7 @@
                     <child>
                       <object class="GtkLabel" id="label406">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">Mo_nth</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">stop_month_box</property>
@@ -389,6 +517,7 @@
                     <child>
                       <object class="GtkLabel" id="label405">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">Y_ear</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">stop_year</property>
@@ -406,6 +535,10 @@
                       <object class="GtkSpinButton" id="stop_day">
                         <property name="visible">True</property>
                         <property name="can_focus">True</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>
                         <property name="adjustment">adjustment3</property>
                         <property name="climb_rate">1</property>
                         <property name="numeric">True</property>
@@ -422,6 +555,7 @@
                     <child>
                       <object class="GtkComboBox" id="stop_month_box">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="model">month_model2</property>
                         <child>
                           <object class="GtkCellRendererText" id="cellrenderertext5"/>
@@ -443,6 +577,10 @@
                       <object class="GtkSpinButton" id="stop_year">
                         <property name="visible">True</property>
                         <property name="can_focus">True</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>
                         <property name="adjustment">adjustment4</property>
                         <property name="climb_rate">1</property>
                         <property name="numeric">True</property>
@@ -485,9 +623,11 @@
                 <child>
                   <object class="GtkHBox" id="hbox96">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <child>
                       <object class="GtkLabel" id="label415">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">Te_xt comment:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">date_text_entry</property>
@@ -503,81 +643,37 @@
                       <object class="UndoableEntry" id="date_text_entry">
                         <property name="visible">True</property>
                         <property name="can_focus">True</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">True</property>
+                        <property name="fill">True</property>
                         <property name="padding">6</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">3</property>
                   </packing>
                 </child>
               </object>
               <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
                 <property name="position">0</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="hbuttonbox36">
-            <property name="visible">True</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="button174">
-                <property name="label">gtk-help</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="button175">
-                <property name="label">gtk-cancel</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="ok_button">
-                <property name="label">gtk-ok</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
           </packing>
         </child>
       </object>
@@ -588,9 +684,15 @@
       <action-widget response="-5">ok_button</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkListStore" id="calendar_model">
+  <object class="GtkListStore" id="month_model1">
     <columns>
-      <!-- column-name gchararray1 -->
+      <!-- column-name gchararray5 -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
+  <object class="GtkListStore" id="month_model2">
+    <columns>
+      <!-- column-name gchararray6 -->
       <column type="gchararray"/>
     </columns>
   </object>
@@ -606,16 +708,4 @@
       <column type="gchararray"/>
     </columns>
   </object>
-  <object class="GtkListStore" id="month_model2">
-    <columns>
-      <!-- column-name gchararray6 -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
-  <object class="GtkListStore" id="month_model1">
-    <columns>
-      <!-- column-name gchararray5 -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
 </interface>