Icons merged and cleaned up
Added header to Settings