Fix bugs and support icon