don't escape HTML in templates, some icons and small changes