Improve algorithm for the number of icon label lines

I was testing various icon sizes and think that 2 lines of text can appear when the icon size is 32px rather than only appearing at 44px.

Presently the top and bottom padding around the label is 7px, while the left and right padding is 4px. I think the top and bottom padding could be reduced by 1 or 2 pixels.