field icon added, search field fix, template edit