Button Fix
HIM-28 #comment  Tester -  check and resolve