diff --git a/plugins/gtkgui/config.py b/plugins/gtkgui/config.py
index 9b58d3935..940212b79 100644
--- a/plugins/gtkgui/config.py
+++ b/plugins/gtkgui/config.py
@@ -303,21 +303,6 @@ class preference_Window:
 		"""When Apply button is clicked"""
 		self.write_cfg()
 
-	def change_notebook_page(self, number):
-		self.notebook.set_current_page(number)
-
-	def on_lookfeel_button_clicked(self, widget, data=None):
-		self.change_notebook_page(0)
-		
-	def on_events_button_clicked(self, widget, data=None):
-		self.change_notebook_page(1)
-		
-	def on_presence_button_clicked(self, widget, data=None):
-		self.change_notebook_page(2)
-
-	def on_log_button_clicked(self, widget, data=None):
-		self.change_notebook_page(3)
-
 	def fill_msg_treeview(self):
 		i = 0
 		self.xml.get_widget('delete_msg_button').set_sensitive(False)
@@ -471,6 +456,14 @@ class preference_Window:
 		for w in widgets:
 			w.set_sensitive(widget.get_active())
 
+	def on_msg_treeview_key_press_event(self, widget, event):
+		if event.keyval == gtk.keysyms.Delete:
+			self.on_delete_msg_button_clicked(widget)
+
+	def on_treeview_emoticons_key_press_event(self, widget, event):
+		if event.keyval == gtk.keysyms.Delete:
+			self.on_button_remove_emoticon_clicked(widget)
+
 	def __init__(self, plugin):
 		"""Initialize Preference window"""
 		self.xml = gtk.glade.XML(GTKGUI_GLADE, 'Preferences', APP)
@@ -667,14 +660,10 @@ class preference_Window:
 					self.xml.get_widget('entry_emoticons'),
 					self.xml.get_widget('button_emoticons'),
 					self.xml.get_widget('image_emoticon')])
-		self.xml.signal_connect('on_lookfeel_button_clicked', \
-			self.on_lookfeel_button_clicked)
-		self.xml.signal_connect('on_events_button_clicked', \
-			self.on_events_button_clicked)
-		self.xml.signal_connect('on_presence_button_clicked', \
-			self.on_presence_button_clicked)
-		self.xml.signal_connect('on_log_button_clicked', \
-			self.on_log_button_clicked)
+		self.xml.signal_connect('on_msg_treeview_key_press_event', \
+			self.on_msg_treeview_key_press_event)
+		self.xml.signal_connect('on_treeview_emoticons_key_press_event', \
+			self.on_treeview_emoticons_key_press_event)
 
 		self.plugin.send('ASK_CONFIG', None, ('GtkGui', 'Logger', {'lognotsep':1,\
 			'lognotusr':1}))
diff --git a/plugins/gtkgui/gtkgui.glade b/plugins/gtkgui/gtkgui.glade
index 3fc886d8b..e6c2df3cb 100644
--- a/plugins/gtkgui/gtkgui.glade
+++ b/plugins/gtkgui/gtkgui.glade
@@ -4293,6 +4293,7 @@ on the server.</property>
 			      <property name="reorderable">False</property>
 			      <property name="enable_search">True</property>
 			      <signal name="cursor_changed" handler="on_treeview_emoticons_cursor_changed" last_modification_time="Tue, 18 Jan 2005 22:12:10 GMT"/>
+			      <signal name="key_press_event" handler="on_treeview_emoticons_key_press_event" last_modification_time="Wed, 02 Feb 2005 21:04:18 GMT"/>
 			    </widget>
 			  </child>
 			</widget>
@@ -4818,6 +4819,7 @@ on the server.</property>
 			  <property name="reorderable">False</property>
 			  <property name="enable_search">True</property>
 			  <signal name="cursor_changed" handler="on_msg_treeview_cursor_changed" last_modification_time="Sun, 24 Oct 2004 21:46:28 GMT"/>
+			  <signal name="key_press_event" handler="on_msg_treeview_key_press_event" last_modification_time="Wed, 02 Feb 2005 21:04:34 GMT"/>
 			</widget>
 		      </child>
 		    </widget>
@@ -4886,7 +4888,7 @@ on the server.</property>
 		  <child>
 		    <widget class="GtkLabel" id="label175">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;b&gt;Preset Messages:&lt;/b&gt;</property>
+		      <property name="label" translatable="yes">&lt;b&gt;Preset Messages :&lt;/b&gt;</property>
 		      <property name="use_underline">False</property>
 		      <property name="use_markup">True</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>