Revert "upgrades in toolbar"

This reverts commit 1ccc95fb3d9b901cf5b6c029c7cb43c63f63f724.
Revert "Revert "upgrades in toolbar""

This reverts commit bbaa12de4e6a2d50950872bf4669c15f94ba5284.
Revert "upgrades in toolbar"

This reverts commit 1ccc95fb3d9b901cf5b6c029c7cb43c63f63f724.