revert changes on GCP-8271
plus fixes on Close All Tabs button display