[DF-922] Fixed button creation issue