Merge "Update Icon App Chip Menu to new specs." into main