Fixed icon
Merging