Toolbar button bug fixed.