Revert "removed two redundant icons; use Django's instead"

This reverts commit e353318fe7ccbb219391274ba8cdb774a3fbb275.
Merge branch 'develop'
Merge branch 'develop'

Conflicts:
	cms/forms/widgets.py
Merge remote-tracking branch 'upstream/master' into develop