diff --git a/plugins/gtkgui/roster_window.py b/plugins/gtkgui/roster_window.py
index 5de175656bf6042c3679f7cc5b9bdd206f6dd2ff..76a833f58c248e4542e08961134bed788e5cffe0 100644
--- a/plugins/gtkgui/roster_window.py
+++ b/plugins/gtkgui/roster_window.py
@@ -923,6 +923,7 @@ class roster_window:
 		"""When we want to close the window"""
 		if self.plugin.systray_visible:
 			self.window.iconify()
+			win.skip_taskbar_hint = True
 		else:
 			self.quit_gtkgui_plugin()
 		return 1
diff --git a/plugins/gtkgui/systray.py b/plugins/gtkgui/systray.py
index c68d1ab85b492a8a3f3aa408cab60eca81f37cd7..29df1fde0715e5da7a259ad3b41def20746db53e 100644
--- a/plugins/gtkgui/systray.py
+++ b/plugins/gtkgui/systray.py
@@ -216,9 +216,9 @@ class systray:
 
 	def show_icon(self):
 		if not self.t:
-			self.t = trayicon.TrayIcon("Gajim")
+			self.t = trayicon.TrayIcon('Gajim')
 			eb = gtk.EventBox()
-			eb.connect("button-press-event", self.on_clicked)
+			eb.connect('button-press-event', self.on_clicked)
 			self.tip = gtk.Tooltips()
 			self.tip.set_tip(self.t, 'Gajim')
 			self.img_tray = gtk.Image()