Changed icon handler to use JSON to store icon information.