Added missing menu icons, and added menu item to change convention.