diff --git a/THANKS b/THANKS
index e00eaa901..028076265 100644
--- a/THANKS
+++ b/THANKS
@@ -2,6 +2,7 @@ Alexander Futász
 Alexander V. Butenko
 Alexey Nezhdanov
 Alfredo Junix
+Anaël Verrier
 Anders Ström
 Andrew Sayman
 Anton Shmigirilov
diff --git a/src/gajim.py b/src/gajim.py
index 2c2a11f7d..8b723511a 100755
--- a/src/gajim.py
+++ b/src/gajim.py
@@ -3039,13 +3039,12 @@ class Interface:
 		if self.systray_capabilities and gajim.config.get('trayicon'):
 			self.show_systray()
 
-		self.roster = roster_window.RosterWindow()
-
 		path_to_file = os.path.join(gajim.DATA_DIR, 'pixmaps', 'gajim.png')
 		pix = gtk.gdk.pixbuf_new_from_file(path_to_file)
-		# set the icon to all newly opened windows
+		# set the icon to all windows
 		gtk.window_set_default_icon(pix)
-		self.roster.window.set_icon_from_file(path_to_file) # and to roster window
+
+		self.roster = roster_window.RosterWindow()
 
 		self.init_emoticons()
 		self.make_regexps()