Two symbolic icons from upstream