Yeah, no idea.  I am hoping to keep the changes here to a minimum, but we should definitely clean that up at some point.  There's at least one place where we assume all the toolbar icons are an `a`, so this is something we could trip over later...