Merge pull request #5 from akbardhedhi/master

Fixes for merge conflicts
Added icons in header