IDEX-584: add icons to menu.
Merge with master.