Added a test icon
Merge branch 'dev'