Merge "Fix icon UX bug" into main