Added icons and fixed API