Added icons, removed settings icon