added icon library
much cleanup of grossness