S3 refactor to support icons directly form S3
make jobs more resilient