Fix header toolbar location code and other action button icon