Couple of fixes (compilation error on non-OSX, string length bug on OSX)
Revert accidental changes to icons