WSOTWO-94: Improved UI of toolbar