fix: rebase main

src/layouts/extraRender.tsx

@@ -294,18 +294,6 @@ export const ExtraContent = (props: { isDarkTheme?: boolean }) => {
           </NewLabel>
         )}
       </div>
-      <Button
-        type="text"
-        size="small"
-        onClick={() => {
-          history.push('/settings');
-        }}
-        style={{
-          color: 'var(--ant-color-text-tertiary)'
-        }}
-      >
-        <IconFont type="icon-settings-02" style={{ fontSize: 18 }} />
-      </Button>
       <DropdownActions menu={{ ...helpMenu }} popupRender={helpPopupRender}>
         <IconWrapper>
           <IconFont

src/layouts/index.tsx

@@ -365,7 +365,7 @@ export default (props: any) => {
         config={{
           apiBaseUrl: GPUSTACK_API_BASE_URL,
           theme: userSettings.theme,
-          iconUrl: '//at.alicdn.com/t/c/font_4613488_8fi68fmt1th.js',
+          iconUrl: '//at.alicdn.com/t/c/font_4613488_mk9rqojjoqk.js',
           isDarkTheme: userSettings.isDarkTheme,
           defaultColorPrimary: COLOR_PRIMARY
         }}

src/layouts/rightRender.tsx

@@ -1,6 +1,5 @@
 // @ts-nocheck
 import avatarImg from '@/assets/images/avatar.png';
-import IconFont from '@/components/icon-font';
 import externalLinks from '@/constants/external-links';
 import {
   DiscordOutlined,
@@ -12,6 +11,7 @@ import {
   ReadOutlined,
   SettingOutlined
 } from '@ant-design/icons';
+import { IconFont } from '@gpustack/core-ui';
 import { getAllLocales, history } from '@umijs/max';
 import { Avatar, Menu, Spin } from 'antd';
 import _ from 'lodash';