Use the new icons on the icon menu - fixes #23