WSOTWO-125: Improved toolbar look and style