Symbolic icon changes and additions from upstream