add icon
Merge branch 'master' into history-icon
fix history icon
Merge pull request #1661 from bechi/history-icon

History icon