Merge new icons

Merging new icons since fork.