Adjustment to the nesting for the icon sizing fix