Merge "ICS clipart from Roman. Also re-enable clipart option in UI."