Was another problem caused by each brush being allowed in more than one paint mode. Added a new field to the brush struct to indicate what mode the icon was last set for; if it's changed then reset it. Not sure if it's really worth it to cache this, could remove it for simplicity.