merge some icons from upstream