Got to work on OSX
Added icons