Remove settings icon and keep Settings as a tab

We will keep Settings as a tab to make it consistent with the other tabs.  Also, removed the Settings icon from the navigation bar.

cc: @jjmerino, @kmeurer, @jamesongamble, @suprbh