Update templates and styles. Add icon field to image widget.