Correct OSX icon and minimisation fixes

Tested, works for me, backported it as I promised. Correct icon also included. Please encourage people to improve icon, because white square is weird in a dock.

http://iconverticons.com used to create .icns file.