Added icons and updated to use luna