Added icons and corrected variable types being used.