DT-1155 button swatch fix