Fix for when icons aren't set