sync with upstream
sync with upstream, some changes were png files are now located