Refs #1969: Look and Feel improvements--new icons (added mapping icons, and new ones are better on retina display), better colours, shorter labels and tooltips.