Cleaned up the source.
formated the icon classes uniformingly