Merge "Fix issue where progress around icons is not shown" into main