More resolver icon cleanup