Fixed color indicator button issue