Added error-warning icons
Corrected markup files
after automerge