Better toolbar button handling
Release: v0.9.1