What if we just did [bug 875985](https://bugzilla.mozilla.org/show_bug.cgi?id=875985) and made everything look the same and didn't go down this road?