Cleaned settings and icon system