some icons added
Merge branch 'new'