delete repeat lines & add icons

Fixes #2164