cherry picking changes from @obama: new icon