to completion: add icons
add more tests