diff --git a/deluge/ui/gtkui/glade/connection_manager.askpassword.ui b/deluge/ui/gtkui/glade/connection_manager.askpassword.ui
index dc17fcc3e..04d3d34d1 100644
--- a/deluge/ui/gtkui/glade/connection_manager.askpassword.ui
+++ b/deluge/ui/gtkui/glade/connection_manager.askpassword.ui
@@ -30,6 +30,7 @@
                 <property name="receives_default">True</property>
                 <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
+                <signal name="clicked" handler="on_askpassword_dialog_connect_button_clicked" swapped="no"/>
               </object>
               <packing>
                 <property name="expand">False</property>
diff --git a/deluge/ui/gtkui/glade/edit_trackers.add.ui b/deluge/ui/gtkui/glade/edit_trackers.add.ui
index d9e3778c7..967c3804c 100644
--- a/deluge/ui/gtkui/glade/edit_trackers.add.ui
+++ b/deluge/ui/gtkui/glade/edit_trackers.add.ui
@@ -30,6 +30,7 @@
                 <property name="receives_default">True</property>
                 <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
+                <signal name="clicked" handler="on_button_add_cancel_clicked" swapped="no"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -47,6 +48,7 @@
                 <property name="receives_default">True</property>
                 <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
+                <signal name="clicked" handler="on_button_add_ok_clicked" swapped="no"/>
               </object>
               <packing>
                 <property name="expand">False</property>
diff --git a/deluge/ui/gtkui/glade/edit_trackers.edit.ui b/deluge/ui/gtkui/glade/edit_trackers.edit.ui
index 2179f9b59..a9582b2cd 100644
--- a/deluge/ui/gtkui/glade/edit_trackers.edit.ui
+++ b/deluge/ui/gtkui/glade/edit_trackers.edit.ui
@@ -5,7 +5,6 @@
   <object class="GtkDialog" id="edit_tracker_entry">
     <property name="width_request">400</property>
     <property name="can_focus">False</property>
-    
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Edit Tracker</property>
     <property name="window_position">center-on-parent</property>
@@ -16,13 +15,11 @@
       <object class="GtkVBox" id="dialog-vbox7">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        
         <property name="spacing">2</property>
         <child internal-child="action_area">
           <object class="GtkHButtonBox" id="dialog-action_area7">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="button_add_cancel1">
@@ -30,9 +27,9 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                
                 <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
+                <signal name="clicked" handler="on_button_edit_cancel_clicked" swapped="no"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -48,9 +45,9 @@
                 <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>
+                <signal name="clicked" handler="on_button_edit_ok_clicked" swapped="no"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -70,19 +67,16 @@
           <object class="GtkVBox" id="vbox2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            
             <property name="spacing">5</property>
             <child>
               <object class="GtkHBox" id="hbox3">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                
                 <property name="spacing">5</property>
                 <child>
                   <object class="GtkImage" id="image2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    
                     <property name="stock">gtk-edit</property>
                   </object>
                   <packing>
@@ -95,7 +89,6 @@
                   <object class="GtkLabel" id="label4">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    
                     <property name="label" translatable="yes">&lt;b&gt;Edit Tracker&lt;/b&gt;</property>
                     <property name="use_markup">True</property>
                   </object>
@@ -116,7 +109,6 @@
               <object class="GtkHSeparator" id="hseparator2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -128,13 +120,11 @@
               <object class="GtkHBox" id="hbox4">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                
                 <property name="spacing">5</property>
                 <child>
                   <object class="GtkLabel" id="label5">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    
                     <property name="label" translatable="yes">Tracker:</property>
                   </object>
                   <packing>
@@ -147,7 +137,6 @@
                   <object class="GtkEntry" id="entry_edit_tracker">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    
                     <property name="invisible_char">•</property>
                     <property name="activates_default">True</property>
                     <property name="invisible_char_set">True</property>