Download PNG Safari issue

Investigate and fix the download png issue in Safari.