Added command/event icon to context menu
Fix build error