Update icon
3.1 compatibility fix
Merge
Usablity