Bug fix
Merge branch 'star' into www0
Bug fix
discussion button icon