Merge "Fix rounding bug in IconTest" into main