Adding icons for resourcetypes that had none.

Fixes #579
Merge branch '2.1'

Conflicts:
	ChangeLog.md