add new icons and edit manifest to reflect icons
Form
Merge remote-tracking branch 'origin/ryanj'

Conflicts:
	manifest.json