Refine color button behaviour