Merge "Using xml override instead of code swap for predicted icon" into main