Change Email code updated

Server files need review and push to server.
"Change Email" button icon needed.