diff --git a/src/gnome-utils/glade/commodity.glade b/src/gnome-utils/glade/commodity.glade
index 70ed0ea08e..9aff41f1b7 100644
--- a/src/gnome-utils/glade/commodity.glade
+++ b/src/gnome-utils/glade/commodity.glade
@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
 <glade-interface>
-  <requires-version lib="gtk+" version="2.12"/>
+  <!-- interface-requires gtk+ 2.10 -->
+  <!-- interface-naming-policy toplevel-contextual -->
   <widget class="GtkDialog" id="Security Selector Dialog">
     <property name="border_width">6</property>
     <property name="title" translatable="yes">Select security/currency </property>
     <property name="resizable">False</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="type_hint">dialog</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">
       <widget class="GtkVBox" id="dialog-vbox12">
@@ -23,7 +24,7 @@
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">Select user information here...</property>
-                <property name="justify">GTK_JUSTIFY_CENTER</property>
+                <property name="justify">center</property>
               </widget>
               <packing>
                 <property name="right_attach">3</property>
@@ -41,7 +42,7 @@
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">_Type:</property>
                     <property name="use_underline">True</property>
-                    <property name="justify">GTK_JUSTIFY_CENTER</property>
+                    <property name="justify">center</property>
                     <property name="mnemonic_widget">namespace_cbe</property>
                   </widget>
                 </child>
@@ -63,7 +64,7 @@
                     <property name="xalign">0</property>
                     <property name="label">_Security/currency:</property>
                     <property name="use_underline">True</property>
-                    <property name="justify">GTK_JUSTIFY_CENTER</property>
+                    <property name="justify">center</property>
                     <property name="mnemonic_widget">commodity_cbe</property>
                   </widget>
                 </child>
@@ -80,9 +81,6 @@
                 <property name="visible">True</property>
                 <property name="items">Dummy namespace entry</property>
                 <signal name="changed" handler="gnc_ui_select_commodity_namespace_changed_cb"/>
-                <child internal-child="entry">
-                  <widget class="GtkEntry" id="comboboxentry-entry1"/>
-                </child>
               </widget>
               <packing>
                 <property name="left_attach">1</property>
@@ -98,11 +96,6 @@
                 <property name="visible">True</property>
                 <property name="items">Dummy security entry should be much longer</property>
                 <signal name="changed" handler="gnc_ui_select_commodity_changed_cb"/>
-                <child internal-child="entry">
-                  <widget class="GtkEntry" id="comboboxentry-entry2">
-                    <property name="width_request">260</property>
-                  </widget>
-                </child>
               </widget>
               <packing>
                 <property name="left_attach">1</property>
@@ -121,48 +114,61 @@
         <child internal-child="action_area">
           <widget class="GtkHButtonBox" id="dialog-action_area12">
             <property name="visible">True</property>
-            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <property name="layout_style">end</property>
             <child>
               <widget class="GtkButton" id="new_button">
+                <property name="label">gtk-new</property>
+                <property name="response_id">1</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="label">gtk-new</property>
+                <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">1</property>
               </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <widget class="GtkButton" id="button69">
+                <property name="label">gtk-cancel</property>
+                <property name="response_id">-6</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="label">gtk-cancel</property>
+                <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-6</property>
               </widget>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
             <child>
               <widget class="GtkButton" id="ok_button">
+                <property name="label">gtk-ok</property>
+                <property name="response_id">-5</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="label">gtk-ok</property>
+                <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-5</property>
               </widget>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">2</property>
               </packing>
             </child>
           </widget>
           <packing>
             <property name="expand">False</property>
-            <property name="pack_type">GTK_PACK_END</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
           </packing>
         </child>
       </widget>
@@ -172,7 +178,7 @@
     <property name="border_width">6</property>
     <property name="title">New Security</property>
     <property name="modal">True</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="type_hint">dialog</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">
       <widget class="GtkVBox" id="dialog-vbox13">
@@ -185,54 +191,6 @@
             <property name="n_columns">3</property>
             <property name="column_spacing">12</property>
             <property name="row_spacing">6</property>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
             <child>
               <widget class="GtkLabel" id="label828">
                 <property name="visible">True</property>
@@ -251,7 +209,6 @@
                 <property name="can_focus">True</property>
                 <property name="has_focus">True</property>
                 <property name="tooltip" translatable="yes">Enter the full name of the commodity. Example: Cisco Systems Inc., or Apple Computer, Inc.</property>
-                <property name="invisible_char">*</property>
                 <property name="activates_default">True</property>
                 <signal name="changed" handler="gnc_ui_commodity_changed_cb"/>
               </widget>
@@ -268,7 +225,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="tooltip" translatable="yes">Enter the ticker symbol for the commodity (e.g. CSCO or AAPL).  If you are retrieving quotes online, this field must exactly match the ticker symbol used by the quote source (including case). </property>
-                <property name="invisible_char">*</property>
                 <property name="activates_default">True</property>
                 <signal name="changed" handler="gnc_ui_commodity_changed_cb"/>
               </widget>
@@ -285,7 +241,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="tooltip" translatable="yes">Enter a unique code used to identify the commodity. Or, you may safely leave this field blank.</property>
-                <property name="invisible_char">*</property>
                 <property name="activates_default">True</property>
               </widget>
               <packing>
@@ -303,12 +258,13 @@
                   <widget class="GtkLabel" id="label814">
                     <property name="visible">True</property>
                     <property name="label" translatable="yes">1 /</property>
-                    <property name="justify">GTK_JUSTIFY_CENTER</property>
+                    <property name="justify">center</property>
                   </widget>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
                     <property name="padding">4</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
@@ -434,7 +390,7 @@
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Type of quote source:</property>
-                    <property name="justify">GTK_JUSTIFY_RIGHT</property>
+                    <property name="justify">right</property>
                   </widget>
                 </child>
               </widget>
@@ -456,7 +412,7 @@
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">_Full name:</property>
                     <property name="use_underline">True</property>
-                    <property name="justify">GTK_JUSTIFY_CENTER</property>
+                    <property name="justify">center</property>
                     <property name="mnemonic_widget">fullname_entry</property>
                   </widget>
                 </child>
@@ -478,7 +434,7 @@
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">_Symbol/abbreviation:</property>
                     <property name="use_underline">True</property>
-                    <property name="justify">GTK_JUSTIFY_CENTER</property>
+                    <property name="justify">center</property>
                     <property name="mnemonic_widget">mnemonic_entry</property>
                   </widget>
                 </child>
@@ -500,7 +456,7 @@
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">_Type:</property>
                     <property name="use_underline">True</property>
-                    <property name="justify">GTK_JUSTIFY_CENTER</property>
+                    <property name="justify">center</property>
                     <property name="mnemonic_widget">namespace_cbe</property>
                   </widget>
                 </child>
@@ -522,7 +478,7 @@
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">ISIN, CUSI_P or other code:</property>
                     <property name="use_underline">True</property>
-                    <property name="justify">GTK_JUSTIFY_CENTER</property>
+                    <property name="justify">center</property>
                     <property name="mnemonic_widget">code_entry</property>
                   </widget>
                 </child>
@@ -544,7 +500,7 @@
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">F_raction traded:</property>
                     <property name="use_underline">True</property>
-                    <property name="justify">GTK_JUSTIFY_CENTER</property>
+                    <property name="justify">center</property>
                   </widget>
                 </child>
               </widget>
@@ -568,13 +524,14 @@
                       </widget>
                       <packing>
                         <property name="expand">False</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
                       <widget class="GtkLabel" id="label824">
                         <property name="visible">True</property>
                         <property name="label" translatable="yes">Warning: Finance::Quote not installed properly.</property>
-                        <property name="justify">GTK_JUSTIFY_CENTER</property>
+                        <property name="justify">center</property>
                       </widget>
                       <packing>
                         <property name="expand">False</property>
@@ -585,7 +542,7 @@
                     <child>
                       <widget class="GtkArrow" id="arrow2">
                         <property name="visible">True</property>
-                        <property name="arrow_type">GTK_ARROW_LEFT</property>
+                        <property name="arrow_type">left</property>
                       </widget>
                       <packing>
                         <property name="expand">False</property>
@@ -609,11 +566,11 @@
                 <property name="left_padding">12</property>
                 <child>
                   <widget class="GtkCheckButton" id="get_quote_check">
+                    <property name="label" translatable="yes">_Get Online Quotes</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="label" translatable="yes">_Get Online Quotes</property>
+                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
-                    <property name="response_id">0</property>
                     <property name="draw_indicator">True</property>
                     <signal name="toggled" handler="gnc_ui_commodity_quote_info_cb"/>
                   </widget>
@@ -633,12 +590,12 @@
                 <property name="left_padding">24</property>
                 <child>
                   <widget class="GtkRadioButton" id="single_source_button">
+                    <property name="label" translatable="yes">Si_ngle:</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
                     <property name="tooltip" translatable="yes">These are F::Q quote sources that retrieve information from a single site on the internet.  If that site is unavailable, you will not be able to retrieve quotes.</property>
-                    <property name="label" translatable="yes">Si_ngle:</property>
                     <property name="use_underline">True</property>
-                    <property name="response_id">0</property>
                     <property name="active">True</property>
                     <property name="draw_indicator">True</property>
                     <signal name="toggled" handler="gnc_ui_commodity_quote_info_cb"/>
@@ -658,12 +615,12 @@
                 <property name="left_padding">24</property>
                 <child>
                   <widget class="GtkRadioButton" id="multi_source_button">
+                    <property name="label" translatable="yes">_Multiple:</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
                     <property name="tooltip" translatable="yes">These are F::Q quote sources that retrieve information from multiple sites on the internet.  If one of the sites is unavailable, F::Q will attempt to retrieve the information from another site.</property>
-                    <property name="label" translatable="yes">_Multiple:</property>
                     <property name="use_underline">True</property>
-                    <property name="response_id">0</property>
                     <property name="draw_indicator">True</property>
                     <property name="group">single_source_button</property>
                     <signal name="toggled" handler="gnc_ui_commodity_quote_info_cb"/>
@@ -683,12 +640,12 @@
                 <property name="left_padding">24</property>
                 <child>
                   <widget class="GtkRadioButton" id="unknown_source_button">
+                    <property name="label" translatable="yes">_Unknown:</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
                     <property name="tooltip" translatable="yes">These are quote sources that were recently added to F::Q.  GnuCash does not know if these sources retrieve information from a single site or from multiple sites on the internet.</property>
-                    <property name="label" translatable="yes">_Unknown:</property>
                     <property name="use_underline">True</property>
-                    <property name="response_id">0</property>
                     <property name="draw_indicator">True</property>
                     <property name="group">single_source_button</property>
                     <signal name="toggled" handler="gnc_ui_commodity_quote_info_cb"/>
@@ -712,7 +669,7 @@
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Time_zone:</property>
                     <property name="use_underline">True</property>
-                    <property name="justify">GTK_JUSTIFY_RIGHT</property>
+                    <property name="justify">right</property>
                   </widget>
                 </child>
               </widget>
@@ -728,9 +685,6 @@
                 <property name="visible">True</property>
                 <property name="items">Dummy namespace</property>
                 <signal name="changed" handler="gnc_ui_commodity_changed_cb"/>
-                <child internal-child="entry">
-                  <widget class="GtkEntry" id="comboboxentry-entry3"/>
-                </child>
               </widget>
               <packing>
                 <property name="left_attach">1</property>
@@ -741,6 +695,54 @@
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
           </widget>
           <packing>
             <property name="position">1</property>
@@ -749,49 +751,62 @@
         <child internal-child="action_area">
           <widget class="GtkHButtonBox" id="dialog-action_area13">
             <property name="visible">True</property>
-            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <property name="layout_style">end</property>
             <child>
               <widget class="GtkButton" id="cancel_button">
+                <property name="label">gtk-cancel</property>
+                <property name="response_id">-6</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="label">gtk-cancel</property>
+                <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-6</property>
               </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <widget class="GtkButton" id="ok_button1">
+                <property name="label">gtk-ok</property>
+                <property name="response_id">-5</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="label">gtk-ok</property>
+                <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-5</property>
               </widget>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
             <child>
               <widget class="GtkButton" id="help_button">
+                <property name="label">gtk-help</property>
+                <property name="response_id">-11</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="label">gtk-help</property>
+                <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-11</property>
               </widget>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">2</property>
               </packing>
             </child>
           </widget>
           <packing>
             <property name="expand">False</property>
-            <property name="pack_type">GTK_PACK_END</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
           </packing>
         </child>
       </widget>