Fix for when icon setting is nil