I'm holding off till the auth stuff is all done refactoring.  Then I'll revisit everything.

The reason I didn't do the icon-with-link route is because this is meant to be silent SSO -- e.g. you just visit gitlab and if you're already logged into openid you don't even notice it authenticating you.

This is how I've hacked the one at work.  I still plan on pushing it upstream to you, but as I said, there is little point while the auth is being working on still.