Added files (without new icon).
Merge