icons-related fixes