[WIP] Fix #22

This is my WIP fix of issue #22.

I am having difficulties with the toolbar icon sprite. Assistance is appreciated.