replace logout with icon
Merge origin/master
replace logout with icon again