Made proper(er) toolbar button