use single icon and only one ! in error
Merge pull request #5 from Structural/ui-changes

for will