fixes to icon menu and some other variations