Merge remote-tracking branch 'mmikeww/add-icon'.