Merge branch 'hotfix/twitter_fix'
Whether icons updated
Merge branch 'hotfix/new_whether_icons' into develop