Made additional tweaks for toolbar buttons display (related to issue
7053)