diff --git a/src/common/helpers.py b/src/common/helpers.py
index 9e93941a19fe2982e3c4559d2f0877ac2f8b8b8a..e500ea30450d30012aecf0e3bc5385b3c667d8a8 100644
--- a/src/common/helpers.py
+++ b/src/common/helpers.py
@@ -532,3 +532,19 @@ def get_global_show():
 		if connected > maxi:
 			maxi = connected
 	return gajim.SHOW_LIST[maxi]
+
+def get_icon_name_to_show(contact, account):
+	'''Get the icon name to show in online, away, requested, ...'''
+	if gajim.awaiting_events[account].has_key(contact.jid):
+		#FIXME: change icon for FT
+		return 'message'
+	if jid.find('@') <= 0: # if not '@' or '@' starts the jid ==> agent
+		return contact.show
+	if contact.sub in ('both', 'to'):
+		return contact.show
+	if contact.ask == 'subscribe':
+		return 'requested'
+	transport = gajim.get_transport_name_from_jid(contat.jid)
+	if transport:
+		return contact.show
+	return 'not in the roster'
diff --git a/src/roster_window.py b/src/roster_window.py
index 89906710a49141047603087d494f21880ac895e5..383f0057e3c8b78646c6629c72c1fc760f827291 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -258,23 +258,8 @@ class RosterWindow:
 					% (colorstring, gtkgui_helpers.escape_for_pango_markup(status))
 
 		state_images = self.get_appropriate_state_images(jid)
-		if gajim.awaiting_events[account].has_key(jid):
-			#FIXME: change icon for FT
-			img = state_images['message']
-		elif jid.find('@') <= 0: # if not '@' or '@' starts the jid ==> agent
-			img = state_images[contact.show]					
-		else:
-			if contact.sub in ('both', 'to'):
-				img = state_images[contact.show]
-			else:
-				if contact.ask == 'subscribe':
-					img = state_images['requested']
-				else:
-					transport = gajim.get_transport_name_from_jid(jid)
-					if transport and state_images.has_key(contact.show):
-						img = state_images[contact.show]
-					else:
-						img = state_images['not in the roster']
+		icon_name = helpers.get_icon_name_to_show(account, contact)
+		img = state_images[icon_name]
 
 		#FIXME: here it gets called to often
 		# for example if we recv a message we also reset the avatar!
diff --git a/src/tooltips.py b/src/tooltips.py
index 4a204e48adf2d2c527a524338b31361e90b6bf01..96cfd03ec28194d5548f9362404670877cb1e9c7 100644
--- a/src/tooltips.py
+++ b/src/tooltips.py
@@ -362,6 +362,7 @@ class RosterTooltip(NotificationAreaTooltip):
 		self.hbox.set_spacing(0)
 		self.create_table()
 		if not contacts or len(contacts) == 0:
+			# Tooltip for merged accounts row
 			accounts = self.get_accounts_info()
 			self.current_row = 0
 			self.table.resize(2, 1)
@@ -374,7 +375,8 @@ class RosterTooltip(NotificationAreaTooltip):
 		prim_contact = gajim.get_highest_prio_contact_from_contacts(contacts)
 		
 		# try to find the image for the contact status
-		state_file = prim_contact.show.replace(' ', '_')
+		icon_name = helpers.get_icon_name_to_show(prim_contact)
+		state_file = icon_name.replace(' ', '_')
 		transport = gajim.get_transport_name_from_jid(prim_contact.jid)
 		if transport:
 			file_path = os.path.join(gajim.DATA_DIR, 'iconsets', 'transports', 
@@ -424,7 +426,8 @@ class RosterTooltip(NotificationAreaTooltip):
 				if contact.resource:
 					status_line = self.get_status_info(contact.resource, contact.priority, 
 						contact.show, contact.status)
-					self.add_status_row(file_path, contact.show, status_line)
+					icon_name = helpers.get_icon_name_to_show(contact)
+					self.add_status_row(file_path, icon_name, status_line)
 					
 		else: # only one resource
 			if contact.resource: