Form buttons colour swatch fix (DT-341)