diff --git a/src/dialogs.py b/src/dialogs.py
index 2008d3416..6ec9e8a1f 100644
--- a/src/dialogs.py
+++ b/src/dialogs.py
@@ -1537,12 +1537,13 @@ class FileTransfersWindow:
 				self.set_status(typ, sid, 'ok')
 		
 	def get_iter_by_sid(self, typ, sid):
+		'''returns iter to the row, which holds file transfer, identified by the
+		session id'''
 		iter = self.model.get_iter_root()
 		while iter:
-			if typ + sid == self.model.get_value(iter, 4):
+			if typ + sid == self.model[iter][4]:
 				return iter
 			iter = self.model.iter_next(iter)
-		return None
 		
 	def add_transfer(self, account, contact, file_props):
 		if file_props is None:
@@ -1620,7 +1621,8 @@ class FileTransfersWindow:
 				self.pause_button.set_property('sensitive', False)
 			
 		return True
-	def on_clean_button_clicked(self, widget):
+
+	def on_remove_button_clicked(self, widget):
 		selected = self.tree.get_selection().get_selected()
 		if selected is None or selected[1] is None:
 			return 
@@ -1665,5 +1667,5 @@ class FileTransfersWindow:
 		
 	def on_file_transfers_dialog_delete_event(self, widget, event):
 		self.window.hide()
-		return True
+		return True # do NOT destory window
 	
diff --git a/src/gtkgui.glade b/src/gtkgui.glade
index b8ecf410c..3853cd0b3 100644
--- a/src/gtkgui.glade
+++ b/src/gtkgui.glade
@@ -3162,7 +3162,7 @@
 			      <child>
 				<widget class="GtkLabel" id="label249">
 				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">Gajim theme:</property>
+				  <property name="label" translatable="yes">Color theme:</property>
 				  <property name="use_underline">False</property>
 				  <property name="use_markup">False</property>
 				  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -4818,7 +4818,7 @@
 		  <child>
 		    <widget class="GtkLabel" id="label214">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Ask status message when going: </property>
+		      <property name="label" translatable="yes">Ask status message when I:</property>
 		      <property name="use_underline">False</property>
 		      <property name="use_markup">False</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -4846,7 +4846,7 @@
 			<widget class="GtkCheckButton" id="prompt_online_status_message_checkbutton">
 			  <property name="visible">True</property>
 			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">_Online</property>
+			  <property name="label" translatable="yes">Sign _in</property>
 			  <property name="use_underline">True</property>
 			  <property name="relief">GTK_RELIEF_NORMAL</property>
 			  <property name="focus_on_click">True</property>
@@ -4866,7 +4866,7 @@
 			<widget class="GtkCheckButton" id="prompt_offline_status_message_checkbutton">
 			  <property name="visible">True</property>
 			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">Of_fline</property>
+			  <property name="label" translatable="yes">Sign _out</property>
 			  <property name="use_underline">True</property>
 			  <property name="relief">GTK_RELIEF_NORMAL</property>
 			  <property name="focus_on_click">True</property>
@@ -5519,7 +5519,7 @@ Custom</property>
 			  <child>
 			    <widget class="GtkCheckButton" id="show_roster_on_startup_checkbutton">
 			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Show roster window on startup</property>
+			      <property name="label" translatable="yes">Show roster window at application startup</property>
 			      <property name="use_underline">True</property>
 			      <property name="relief">GTK_RELIEF_NORMAL</property>
 			      <property name="focus_on_click">True</property>
@@ -5559,7 +5559,7 @@ Custom</property>
 			    <widget class="GtkCheckButton" id="check_for_new_version_checkbutton">
 			      <property name="visible">True</property>
 			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Check for new _version at startup</property>
+			      <property name="label" translatable="yes">Check for new _version at application startup</property>
 			      <property name="use_underline">True</property>
 			      <property name="relief">GTK_RELIEF_NORMAL</property>
 			      <property name="focus_on_click">True</property>
@@ -17148,7 +17148,7 @@ Maybe I'll refactor later</property>
 	  <property name="spacing">6</property>
 
 	  <child>
-	    <widget class="GtkButton" id="clean_button">
+	    <widget class="GtkButton" id="remove_button">
 	      <property name="visible">True</property>
 	      <property name="can_default">True</property>
 	      <property name="can_focus">True</property>
@@ -17162,7 +17162,7 @@ Maybe I'll refactor later</property>
 		<atkproperty name="AtkObject::accessible_description" translatable="yes">This action removes single file transfer from the list. If the transfer is active, it is first stopped and then removed</atkproperty>
 		<atkaction action_name="click" description="Stoping transfer"/>
 	      </accessibility>
-	      <signal name="clicked" handler="on_clean_button_clicked" last_modification_time="Mon, 01 Aug 2005 14:38:18 GMT"/>
+	      <signal name="clicked" handler="on_remove_button_clicked" last_modification_time="Wed, 03 Aug 2005 00:23:18 GMT"/>
 	    </widget>
 	  </child>
 
@@ -17210,7 +17210,7 @@ Maybe I'll refactor later</property>
 	<widget class="GtkCheckButton" id="notify_ft_complete_checkbox">
 	  <property name="visible">True</property>
 	  <property name="can_focus">True</property>
-	  <property name="label" translatable="yes">_Notify me when transfer is complete</property>
+	  <property name="label" translatable="yes">_Notify me when a file transfer is complete</property>
 	  <property name="use_underline">True</property>
 	  <property name="relief">GTK_RELIEF_NORMAL</property>
 	  <property name="focus_on_click">True</property>