added new settings icon and removed a few warnings