[DF-1785] Color picker fixup