[DF-1785] ColorPicker refactoring