Added icons and other stuff