Merge branch 'hotfix/twitter_icon'

* hotfix/twitter_icon:
  fix margin of twitter icon bleat!:wq
fix-to-fix fixed
Merge branch 'hotfix/fix_to_fix' into develop

* hotfix/fix_to_fix:
  fix-to-fix fixed