- add menuitem function
- add icon
Merge remote-tracking branch 'origin'