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.
Specified ALL classes required for the tabbar icons when labels are present, so that the size is only adjusted in this specific case.