Tidy up some headers.
Update icons.