Source file for the icon
Merge remote-tracking branch 'upstream/master'
osx-specific code cleanup and restructuring; regenerate icon based on latest SVG