Merge changes I65f46028,Ie3f67ccd into sc-dev

* changes:
  Make the pointer for bubbles expanded view rounded
  Update the manage button to the new style