Updated from image to icon.
Merge remote-tracking branch 'upstream/release-6.6.3.a1' into release-6.6.3.a1

* upstream/release-6.6.3.a1:
Updated from image to icon.
Updated from image to icon.
Merge pull request #1637 from anilgooru/release-6.6.3.a1

Updated from image to icon.
Merge pull request #1638 from Gooru/release-6.6.3.a1

Updated from image to icon.