CLC-2898 - Use same format for images

https://jira.media.berkeley.edu/jira/browse/CLC-2898