Header added and icon underline fix