Clean up toolbar images and add Retina assets.
Merge pull request #4315 from shorlander/master

Clean up toolbar images and add Retina assets.