Simplify avatar upload, currently leads to usability issue

Right now a lot of users think it's not working. This is what they do:

• click the upload and select button

They don't see the small "select file" button.

We need to improve this to avoid confusion