Refactor Users Images

Worked: 2h
Total: 7h