Fix PC3 Button/ToolButton icons not always having the right color set

Noah Davisrequested to merge
work/ndavis/button-icon-colorscope into master

BUG: 426556

FIXED-IN: 5.75

Merge request reports