2.0 misc

More configurability for icons, flash messages and some cleanup