Fixed icon choice.
Merged