New icon and refactor manifest