Fix issues with missing icons (all not-first icons were ignored?)