Icon image mac
Merge remote-tracking branch 'origin/Release3.0' into Release3.0