Improve the button for editing the user avatar

The controls for uploading, editing and deleting the profile picture (avatar) are very hidden.

Is very easy for the user to get lost navigating the images by clicking directly on it to select, but instead the user is lead to the direct link to the image, loosing all context.