[PATCH] Toolbar fixes