Icon resized.
Merge remote-tracking branch 'origin/develop'

Conflicts:
	manifest.json
Merge branch 'develop'