mobile: user-icon refactor starts