Group the width of button labels and button images separately

This is needed to keep button widths grouped like they were on desktops while making the narrow mode consistently work.

This will also be usefull if we want to have some buttons with labels and others with icons in narrow mode.