Added icons
Merge branch 'issues/12'