Adopted to new toolbar API