Fix a few linter warnings, converted icon