Added icons.
Removed vendor specific icons.