More work on the icon menu.