diff --git a/comp/src/gb.dbus.trayicon/.src/DBusStatusIcon.class b/comp/src/gb.dbus.trayicon/.src/DBusStatusIcon.class
index 22de08650..8fe8d120a 100644
--- a/comp/src/gb.dbus.trayicon/.src/DBusStatusIcon.class
+++ b/comp/src/gb.dbus.trayicon/.src/DBusStatusIcon.class
@@ -181,9 +181,9 @@ Property Read org_kde_StatusNotifierItem_Menu As DBusObject
 ' Asks the status notifier item to show a context menu, this is typically a consequence of user input, such as mouse right click over the graphical representation of the item.
 ' 
 ' the x and y parameters are in screen coordinates and is to be considered an hint to the item about where to show the context menu.
-Public Sub org_kde_StatusNotifierItem_ContextMenu(X As Integer, Y As Integer)
+Public Sub org_kde_StatusNotifierItem_ContextMenu((X) As Integer, (Y) As Integer)
   
-  GetParent()._ContextMenu(X, Y)
+  'GetParent()._ContextMenu(X, Y)
   
 End
 
diff --git a/comp/src/gb.dbus.trayicon/.src/TrayIcon.class b/comp/src/gb.dbus.trayicon/.src/TrayIcon.class
index 9bdfc43c4..6a5e4cee8 100644
--- a/comp/src/gb.dbus.trayicon/.src/TrayIcon.class
+++ b/comp/src/gb.dbus.trayicon/.src/TrayIcon.class
@@ -12,7 +12,6 @@ Public Enum Horizontal, Vertical
 
 Event Click
 Event Scroll(Delta As Float, Orientation As Integer)
-Event Menu
 
 Property Name As String
 Property Picture, Icon As Picture
@@ -171,8 +170,10 @@ Private Sub Picture_Write(Value As Picture)
   
   If $bAppIndicator Then 
     $bIconDirty = True
-    Hide
-    Show
+    If $bVisible Then
+      Hide
+      Show
+    Endif
   Endif
   
   If $bVisible Or If $bAppIndicator Then DBus[GetServiceName()].Raise($hObject, "org.kde.StatusNotifierItem.NewIcon")
@@ -193,17 +194,13 @@ Private Sub GetMenu() As Menu
 
 End
 
-Public Sub _ContextMenu(X As Integer, Y As Integer)
-  
-  Dim hMenu As Menu = GetMenu()
-  
-  If hMenu Then
-    hMenu.Popup(X, Y)
-  Else
-    Raise Menu
-  Endif
-  
-End
+' Public Sub _ContextMenu(X As Integer, Y As Integer)
+'   
+'   Dim hMenu As Menu = GetMenu()
+'   
+'   If hMenu Then hMenu.Popup(X, Y)
+'   
+' End
 
 Private Function PopupMenu_Read() As String
 
diff --git a/gb.gtk/src/CTrayIcon.cpp b/gb.gtk/src/CTrayIcon.cpp
index bd438e7ff..ae0b4d455 100644
--- a/gb.gtk/src/CTrayIcon.cpp
+++ b/gb.gtk/src/CTrayIcon.cpp
@@ -35,7 +35,6 @@
 
 DECLARE_EVENT(EVENT_Click);
 DECLARE_EVENT(EVENT_Scroll);
-DECLARE_EVENT(EVENT_Menu);
 
 static void cb_destroy(gTrayIcon *sender)
 {
@@ -69,7 +68,7 @@ static void cb_menu(gTrayIcon *sender)
 		}
 	}
 
-	GB.Raise(sender->hFree, EVENT_Menu, 0);
+	//GB.Raise(sender->hFree, EVENT_Menu, 0);
 }
 
 static void cb_scroll(gTrayIcon *sender)
@@ -323,7 +322,6 @@ GB_DESC TrayIconDesc[] =
 	
 	GB_EVENT("Click", NULL, NULL, &EVENT_Click),
 	GB_EVENT("Scroll", NULL, "(Delta)f(Orientation)i", &EVENT_Scroll),
-	GB_EVENT("Menu", NULL, NULL, &EVENT_Menu),
 
 	GB_METHOD("_unknown", "v", TrayIcon_unknown, "."),
 
diff --git a/gb.qt4/src/ctrayicon.cpp b/gb.qt4/src/ctrayicon.cpp
index e18f2c94d..173264a16 100644
--- a/gb.qt4/src/ctrayicon.cpp
+++ b/gb.qt4/src/ctrayicon.cpp
@@ -34,7 +34,6 @@
 
 DECLARE_EVENT(EVENT_Click);
 DECLARE_EVENT(EVENT_Scroll);
-DECLARE_EVENT(EVENT_Menu);
 
 static QList<CTRAYICON *> _list;
 static QPixmap *_default_trayicon = NULL;
@@ -441,7 +440,6 @@ GB_DESC TrayIconDesc[] =
 	
 	GB_EVENT("Click", NULL, NULL, &EVENT_Click),
 	GB_EVENT("Scroll", NULL, "(Delta)f(Orientation)i", &EVENT_Scroll),
-	GB_EVENT("Menu", NULL, NULL, &EVENT_Menu),
 
 	GB_METHOD("_unknown", "v", TrayIcon_unknown, "."),