Revert "Use user icon instead of cog"

This reverts commit beafea3c2c797d1be017eeede52538aa9437eb2a.

  @marcusramberg:

  The problem with the user icon is that it's very difficult to
  understand which icon to click when you want to edit profile or change
  connection settings.

  Even I got confused when I clicked the "Convos" icon on my cell and
  wanted to edit my profile.