added toolbar icons, show/hide icon text