header and minor cleanup
included icons