Refact icons
Add template vals
fix test code
Merge branch 'Pull request #2'