--- a/browser_side/contact.py	Fri Nov 22 21:43:08 2013 +0100
+++ b/browser_side/contact.py	Sat Nov 23 14:46:03 2013 +0100
@@ -31,7 +31,7 @@
 from pyjamas import DOM
 
 from browser_side.panels import ChatPanel, MicroblogPanel, PopupMenuPanel, WebPanel
-from browser_side.tools import DragLabel, html_sanitize
+from browser_side.tools import DragLabel, html_sanitize, setPresenceStyle
 from __pyjamas__ import doc
 
 
@@ -161,7 +161,7 @@
         self.context_menu = PopupMenuPanel(entries=self.menu_entries,
                                            hide=self.contextMenuHide,
                                            callback=self.contextMenuCallback,
-                                           vertical=False, menu_style="menu")
+                                           vertical=False, style={"selected": "menu-selected"})
 
     def contextMenuHide(self, sender, key):
         """Return True if the item for that sender should be hidden."""
@@ -194,10 +194,7 @@
         _item = self.getContactLabel(jid)
         if _item:
             if type_ == 'availability':
-                if state == 'unavailable':
-                    _item.removeStyleName('contactConnected')
-                else:
-                    _item.addStyleName('contactConnected')
+                setPresenceStyle(_item, state)
             elif type_ == 'messageWaiting':
                 _item.setMessageWaiting(state)
 
@@ -377,3 +374,4 @@
             for contact in self._contact_list:
                 if contact.jid in self.groups[sender.group]:
                     contact.removeStyleName("selected")
+