Fix icon_one and icon_many. Fixes #123