Merge "Add Account button now follow UX guidlines." into jb-dev