Merge "Bind customization option icon colors (2/2)" into main