Improved toolbar rendering.