multi-item and icon fix