DAR-1714 and DAR-1717: Use JPG instead of PNGs, cleanup