Default icons:
Fix merge conflict