Added tab icons.
Manual merge