Merge "Make provider icon sizes consistent" into main