fix #1574 new add icons
simple code improvements