Saner handling of toolbar buttons & plugins