re #91: Cleanup toolbar implementation
re #91: Fix image paths