Merge "Allow icons to take up full width in all cases where width > height." into tm-dev