osx icons upload
initial merge