Change Icon and add contextMenu support