Incorrect tabbar icon height selector during merge.

You brought the i.icon height override in at the wrong level, so it isn't being applied.