Added icons and other fixes