Previously, we were trying to expand a variable which wasn't defined. We
correct that here. Furthermore, we don't right-align the gravatar if
its being shown in the settings panel by removing the "profile_picture"
class.
(imported from commit 1ae09d1a44aca87962f971af82393bf4ece6d16c)
I don't love some of these icons, so I view them as pretty temporary.
(I'd like, e.g., settings to be a gear.)
(imported from commit 0433f226082acc37392e97b20648be8eee704b7b)