Add icon and more work