Was breaking on webexceptions, but seem to have caught all the relevant ones
Add proper icons