Fixed toolbar icons/colors