diff --git a/plugins/TorrentNotification/notification_preferences.glade b/plugins/TorrentNotification/notification_preferences.glade
index 65520dc6e..32d749298 100644
--- a/plugins/TorrentNotification/notification_preferences.glade
+++ b/plugins/TorrentNotification/notification_preferences.glade
@@ -1,12 +1,13 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
+<!--*- mode: xml -*-->
 <glade-interface>
   <widget class="GtkDialog" id="dialog">
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Torrent Notification Preferences</property>
     <property name="default_width">313</property>
     <property name="default_height">167</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">
       <widget class="GtkVBox" id="dialog-vbox1">
@@ -17,42 +18,29 @@
           <widget class="GtkTable" id="table1">
             <property name="visible">True</property>
             <property name="n_rows">2</property>
-            <property name="n_columns">1</property>
             <child>
-	      <widget class="GtkCheckButton" id="chk_tray_blink">
-	        <property name="visible">True</property>
-	        <property name="can_focus">True</property>
-	        <property name="label" translatable="yes">Enable blinking tray icon</property>
-	        <property name="use_underline">True</property>
-	        <property name="relief">GTK_RELIEF_NORMAL</property>
-	        <property name="focus_on_click">True</property>
-	        <property name="active">False</property>
-	        <property name="inconsistent">False</property>
-	        <property name="draw_indicator">True</property>
-	      </widget>
-	      <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-	      </packing>
+              <widget class="GtkCheckButton" id="chk_tray_blink">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="label" translatable="yes">Enable blinking tray icon</property>
+                <property name="use_underline">True</property>
+                <property name="response_id">0</property>
+                <property name="draw_indicator">True</property>
+              </widget>
             </child>
             <child>
-	      <widget class="GtkCheckButton" id="chk_notification">
-	        <property name="visible">True</property>
-	        <property name="can_focus">True</property>
-	        <property name="label" translatable="yes">Enable popup notification</property>
-	        <property name="use_underline">True</property>
-	        <property name="relief">GTK_RELIEF_NORMAL</property>
-	        <property name="focus_on_click">True</property>
-	        <property name="active">False</property>
-	        <property name="inconsistent">False</property>
-	        <property name="draw_indicator">True</property>
-	      </widget>
-	      <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
+              <widget class="GtkCheckButton" id="chk_notification">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="label" translatable="yes">Enable popup notification</property>
+                <property name="use_underline">True</property>
+                <property name="response_id">0</property>
+                <property name="draw_indicator">True</property>
+              </widget>
+              <packing>
                 <property name="top_attach">1</property>
                 <property name="bottom_attach">2</property>
-	      </packing>
+              </packing>
             </child>
           </widget>
           <packing>
@@ -69,6 +57,7 @@
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">gtk-cancel</property>
                 <property name="use_stock">True</property>
+                <property name="response_id">0</property>
               </widget>
             </child>
             <child>