SW-11 Update watch and watching button on click of popup icon