Revert "Revert "change png,s""

This reverts commit 51ff63054633da02d2a9a3809458ccec42e49d1e.