Rebased/updated version of Dennis's live dev reason fix

I let Dennis's pull request in #2178 go stale, so I'm rebasing it and making one final tweak to make the twipsy go to the left of the icon.

Fixes #1697.