bugfix
switch user icon
refactor and bugfix