Added icons and some additional config options