change icon
Merge remote-tracking branch 'origin/release-1.1.2' into release-1.1.2