Fixing icon size on wx2.9, OSX
fixing merge conflicts.