diff --git a/plugins/gtkgui/config.py b/plugins/gtkgui/config.py
index bd232c36e..874f411f4 100644
--- a/plugins/gtkgui/config.py
+++ b/plugins/gtkgui/config.py
@@ -179,7 +179,7 @@ class preferences_window:
 		self.plugin.send('CONFIG', None, ('GtkGui', self.plugin.config, 'GtkGui'))
 		self.plugin.roster.draw_roster()
 	
-	def on_reset_colors_button_clicked(self, widget):
+	def on_reset_colors_and_fonts_button_clicked(self, widget):
 		defaults = self.plugin.default_config
 		self.plugin.config['inmsgcolor'] = defaults['inmsgcolor']
 		self.plugin.config['outmsgcolor'] = defaults['outmsgcolor']
diff --git a/plugins/gtkgui/gtkgui.glade b/plugins/gtkgui/gtkgui.glade
index 7ce51efda..35ac7d471 100644
--- a/plugins/gtkgui/gtkgui.glade
+++ b/plugins/gtkgui/gtkgui.glade
@@ -3750,11 +3750,11 @@ on the server as a vCard</property>
 	      </child>
 
 	      <child>
-		<widget class="GtkButton" id="reset_colors_button">
+		<widget class="GtkButton" id="reset_colors_and_fonts_button">
 		  <property name="visible">True</property>
 		  <property name="relief">GTK_RELIEF_NONE</property>
 		  <property name="focus_on_click">False</property>
-		  <signal name="clicked" handler="on_reset_colors_button_clicked" last_modification_time="Sun, 06 Mar 2005 18:40:18 GMT"/>
+		  <signal name="clicked" handler="on_reset_colors_and_fonts_button_clicked" last_modification_time="Sun, 06 Mar 2005 20:29:53 GMT"/>
 
 		  <child>
 		    <widget class="GtkAlignment" id="alignment50">
@@ -3794,7 +3794,7 @@ on the server as a vCard</property>
 			  <child>
 			    <widget class="GtkLabel" id="label215">
 			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Reset to default colors</property>
+			      <property name="label" translatable="yes">_Reset to default colors &amp; fonts</property>
 			      <property name="use_underline">True</property>
 			      <property name="use_markup">False</property>
 			      <property name="justify">GTK_JUSTIFY_LEFT</property>
diff --git a/plugins/gtkgui/gtkgui.py b/plugins/gtkgui/gtkgui.py
index 294dd2574..1c411aa2d 100644
--- a/plugins/gtkgui/gtkgui.py
+++ b/plugins/gtkgui/gtkgui.py
@@ -2362,7 +2362,7 @@ class roster_window:
 		self.begin_emot = ''
 		split_line = self.plugin.config['emoticons'].split('\t')
 		for i in range(0, len(split_line)/2):
-			 # (nk) lost you here. if you remember add some comments about the idea of the algo
+			# (nk) lost you here. if you remember add some comments about the idea of the algo
 			emot_file = split_line[2*i+1]
 			if not self.image_is_ok(emot_file):
 				continue