Solving some lint issues
More lint code cleanup
Solved icon lint problems