Add/rework some icons