Removed debug message and fixed icons not using metadata