Fix toolbar hints

Fix #28.
Merge pull request #32 from tbeu/fix-hints

Fix toolbar hints