diff --git a/electron.vite.config.ts b/electron.vite.config.ts
index a8e99cd9..4caf9ce3 100644
--- a/electron.vite.config.ts
+++ b/electron.vite.config.ts
@@ -15,9 +15,6 @@ export default defineConfig({
         '@renderer': resolve('src/renderer/src')
       }
     },
-    plugins: [react()],
-    server: {
-      hmr: false
-    }
+    plugins: [react()]
   }
 })
diff --git a/src/renderer/src/pages/home/RightSidebar/SettingsTab.tsx b/src/renderer/src/pages/home/RightSidebar/SettingsTab.tsx
index ed6c9acd..cd803b5c 100644
--- a/src/renderer/src/pages/home/RightSidebar/SettingsTab.tsx
+++ b/src/renderer/src/pages/home/RightSidebar/SettingsTab.tsx
@@ -5,7 +5,12 @@ import { useAssistant } from '@renderer/hooks/useAssistant'
 import { useSettings } from '@renderer/hooks/useSettings'
 import { SettingDivider, SettingRow, SettingRowTitle, SettingSubtitle } from '@renderer/pages/settings'
 import { useAppDispatch } from '@renderer/store'
-import { setMessageFont, setShowInputEstimatedTokens, setShowMessageDivider } from '@renderer/store/settings'
+import {
+  setFontSize,
+  setMessageFont,
+  setShowInputEstimatedTokens,
+  setShowMessageDivider
+} from '@renderer/store/settings'
 import { Assistant, AssistantSettings } from '@renderer/types'
 import { Col, Row, Select, Slider, Switch, Tooltip } from 'antd'
 import { FC, useEffect, useState } from 'react'
@@ -18,10 +23,12 @@ interface Props {
 
 const SettingsTab: FC<Props> = (props) => {
   const { assistant, updateAssistantSettings, updateAssistant } = useAssistant(props.assistant.id)
+  const { fontSize } = useSettings()
   const [temperature, setTemperature] = useState(assistant?.settings?.temperature ?? DEFAULT_TEMPERATURE)
   const [contextCount, setConextCount] = useState(assistant?.settings?.contextCount ?? DEFAULT_CONEXTCOUNT)
   const [enableMaxTokens, setEnableMaxTokens] = useState(assistant?.settings?.enableMaxTokens ?? false)
   const [maxTokens, setMaxTokens] = useState(assistant?.settings?.maxTokens ?? 0)
+  const [fontSizeValue, setFontSizeValue] = useState(fontSize)
   const { t } = useTranslation()
 
   const dispatch = useAppDispatch()
@@ -123,7 +130,7 @@ const SettingsTab: FC<Props> = (props) => {
           />
         </Col>
       </Row>
-      <Row align="middle" justify="space-between" style={{ marginBottom: 8 }}>
+      <Row align="middle" justify="space-between">
         <HStack alignItems="center">
           <Label>{t('chat.settings.max_tokens')}</Label>
           <Tooltip title={t('chat.settings.max_tokens.tip')}>
@@ -139,20 +146,19 @@ const SettingsTab: FC<Props> = (props) => {
           }}
         />
       </Row>
-      {enableMaxTokens && (
-        <Row align="middle" gutter={10}>
-          <Col span={24}>
-            <Slider
-              min={0}
-              max={32000}
-              onChange={setMaxTokens}
-              onChangeComplete={onMaxTokensChange}
-              value={typeof maxTokens === 'number' ? maxTokens : 0}
-              step={100}
-            />
-          </Col>
-        </Row>
-      )}
+      <Row align="middle" gutter={10}>
+        <Col span={24}>
+          <Slider
+            disabled={!enableMaxTokens}
+            min={0}
+            max={32000}
+            onChange={setMaxTokens}
+            onChangeComplete={onMaxTokensChange}
+            value={typeof maxTokens === 'number' ? maxTokens : 0}
+            step={100}
+          />
+        </Col>
+      </Row>
       <SettingSubtitle>{t('settings.messages.title')}</SettingSubtitle>
       <SettingDivider />
       <SettingRow>
@@ -173,7 +179,30 @@ const SettingsTab: FC<Props> = (props) => {
         />
       </SettingRow>
       <SettingDivider />
-      <SettingSubtitle style={{ marginTop: 20 }}>{t('settings.messages.input.title')}</SettingSubtitle>
+      <SettingRow>
+        <SettingRowTitleSmall>{t('settings.font_size.title')}</SettingRowTitleSmall>
+      </SettingRow>
+      <Row align="middle" gutter={10}>
+        <Col span={24}>
+          <Slider
+            value={fontSizeValue}
+            onChange={(value) => setFontSizeValue(value)}
+            onChangeComplete={(value) => {
+              dispatch(setFontSize(value))
+              console.debug('set font size', value)
+            }}
+            min={12}
+            max={18}
+            step={1}
+            marks={{
+              12: <span style={{ fontSize: '12px' }}>A</span>,
+              14: <span style={{ fontSize: '14px' }}>{t('common.default')}</span>,
+              18: <span style={{ fontSize: '18px' }}>A</span>
+            }}
+          />
+        </Col>
+      </Row>
+      <SettingSubtitle>{t('settings.messages.input.title')}</SettingSubtitle>
       <SettingDivider />
       <SettingRow>
         <SettingRowTitleSmall>{t('settings.messages.input.show_estimated_tokens')}</SettingRowTitleSmall>
@@ -211,8 +240,7 @@ const Container = styled.div`
 const Label = styled.p`
   margin: 0;
   font-size: 12px;
-  font-weight: 600;
-  margin-right: 8px;
+  margin-right: 5px;
 `
 
 const QuestionIcon = styled(QuestionCircleOutlined)`
diff --git a/src/renderer/src/pages/settings/AssistantSettings.tsx b/src/renderer/src/pages/settings/AssistantSettings.tsx
index 2ae15d37..032be0eb 100644
--- a/src/renderer/src/pages/settings/AssistantSettings.tsx
+++ b/src/renderer/src/pages/settings/AssistantSettings.tsx
@@ -209,7 +209,6 @@ const AssistantSettings: FC = () => {
 const Label = styled.p`
   margin: 0;
   font-size: 14px;
-  font-weight: bold;
   margin-right: 5px;
 `
 
diff --git a/src/renderer/src/pages/settings/index.tsx b/src/renderer/src/pages/settings/index.tsx
index f731e4f5..c6c0f41c 100644
--- a/src/renderer/src/pages/settings/index.tsx
+++ b/src/renderer/src/pages/settings/index.tsx
@@ -28,9 +28,10 @@ export const SettingTitle = styled.div`
 
 export const SettingSubtitle = styled.div`
   font-size: 14px;
-  color: var(--color-text-2);
+  color: var(--color-text-1);
   margin: 15px 0 0 0;
   user-select: none;
+  font-weight: bold;
 `
 
 export const SettingDivider = styled(Divider)`