Remove hashtags in comments too.

And general code clean up/optimizations, oh, and make the icon prettier.