Put icon changer in CheckedChanged

This has no functional change, it's just easier for maintainability.

[skip ci]