update feature #5157, fixing icon name and improve JSP view using JSTL