Tooltips, more icons
Merge pull request #229 from irskep/tooltips-and-icons

Tooltips, more icons