delete repeat lines & add icons
add og screenshot
Merge pull request #2166 from bechi/ui-changes

delete repeat lines & add icons