Fix resetting images and enhance cropping

Conflicts:
	build/hotfix-changelog.md