diff --git a/src/main/services/ConfigManager.ts b/src/main/services/ConfigManager.ts
index bb0cbfc422..6242709385 100644
--- a/src/main/services/ConfigManager.ts
+++ b/src/main/services/ConfigManager.ts
@@ -62,7 +62,7 @@ export class ConfigManager {
   }
 
   getTrayOnClose(): boolean {
-    return !!this.get(ConfigKeys.TrayOnClose, false)
+    return !!this.get(ConfigKeys.TrayOnClose, true)
   }
 
   setTrayOnClose(value: boolean) {
diff --git a/src/main/services/WindowService.ts b/src/main/services/WindowService.ts
index ba508d7048..b67cac03d6 100644
--- a/src/main/services/WindowService.ts
+++ b/src/main/services/WindowService.ts
@@ -331,11 +331,6 @@ export class WindowService {
 
       event.preventDefault()
 
-      if (mainWindow.isFullScreen()) {
-        mainWindow.setFullScreen(false)
-        return
-      }
-
       mainWindow.hide()
 
       //for mac users, should hide dock icon if close to tray
diff --git a/src/renderer/src/components/Alert/OpenAIAlert.tsx b/src/renderer/src/components/Alert/OpenAIAlert.tsx
index 7f8695fa05..455ab62987 100644
--- a/src/renderer/src/components/Alert/OpenAIAlert.tsx
+++ b/src/renderer/src/components/Alert/OpenAIAlert.tsx
@@ -17,7 +17,7 @@ const OpenAIAlert = () => {
 
   return (
     <Alert
-      style={{ width: '100%', marginTop: 5 }}
+      style={{ width: '100%', marginTop: 5, marginBottom: 5 }}
       message={t('settings.provider.openai.alert')}
       closable
       afterClose={() => {
diff --git a/src/renderer/src/components/app/Navbar.tsx b/src/renderer/src/components/app/Navbar.tsx
index 85a5265560..e5fe83b98c 100644
--- a/src/renderer/src/components/app/Navbar.tsx
+++ b/src/renderer/src/components/app/Navbar.tsx
@@ -1,6 +1,6 @@
 import { isLinux, isMac, isWindows } from '@renderer/config/constant'
-import useNavBackgroundColor from '@renderer/hooks/useNavBackgroundColor'
 import { useFullscreen } from '@renderer/hooks/useFullscreen'
+import useNavBackgroundColor from '@renderer/hooks/useNavBackgroundColor'
 import type { FC, PropsWithChildren } from 'react'
 import type { HTMLAttributes } from 'react'
 import styled from 'styled-components'
diff --git a/src/renderer/src/i18n/locales/ru-ru.json b/src/renderer/src/i18n/locales/ru-ru.json
index cb182f71a9..2f3a2e1baf 100644
--- a/src/renderer/src/i18n/locales/ru-ru.json
+++ b/src/renderer/src/i18n/locales/ru-ru.json
@@ -869,7 +869,8 @@
         "number_images_tip": "Количество увеличенных результатов для генерации",
         "seed_tip": "Контролирует случайный характер увеличения изображений для воспроизводимых результатов",
         "magic_prompt_option_tip": "Улучшает увеличение изображений с помощью интеллектуального оптимизирования промптов"
-      }
+      },
+      "rendering_speed": "Скорость рендеринга"
     },
     "prompts": {
       "explanation": "Объясните мне этот концепт",
@@ -927,7 +928,6 @@
     "restore": {
       "confirm": "Вы уверены, что хотите восстановить данные?",
       "confirm.button": "Выбрать файл резервной копии",
-
       "content": "Операция восстановления перезапишет все текущие данные приложения данными из резервной копии. Это может занять некоторое время.",
       "progress": {
         "completed": "Восстановление завершено",
diff --git a/src/renderer/src/i18n/locales/zh-cn.json b/src/renderer/src/i18n/locales/zh-cn.json
index 1493d0d249..ca72417a8d 100644
--- a/src/renderer/src/i18n/locales/zh-cn.json
+++ b/src/renderer/src/i18n/locales/zh-cn.json
@@ -244,7 +244,7 @@
       "settings.context_count": "上下文数",
       "settings.context_count.tip": "要保留在上下文中的消息数量，数值越大，上下文越长，消耗的 token 越多。普通聊天建议 5-10",
       "settings.max": "不限",
-      "settings.max_tokens": "最大 Token 数",
+      "settings.max_tokens": "最大 TOKEN 数",
       "settings.max_tokens.confirm": "最大 Token 数",
       "settings.max_tokens.confirm_content": "设置单次交互所用的最大 Token 数, 会影响返回结果的长度。要根据模型上下文限制来设置，否则会报错",
       "settings.max_tokens.tip": "单次交互所用的最大 Token 数, 会影响返回结果的长度。要根据模型上下文限制来设置，否则会报错",
@@ -1678,7 +1678,7 @@
         "reset": "重置"
       },
       "openai": {
-        "title": "OpenAI设置",
+        "title": "OpenAI 设置",
         "summary_text_mode.title": "摘要模式",
         "summary_text_mode.tip": "模型执行的推理摘要",
         "summary_text_mode.auto": "自动",
diff --git a/src/renderer/src/pages/apps/App.tsx b/src/renderer/src/pages/apps/App.tsx
index 506aaded1e..41c069f12d 100644
--- a/src/renderer/src/pages/apps/App.tsx
+++ b/src/renderer/src/pages/apps/App.tsx
@@ -156,14 +156,16 @@ const App: FC<Props> = ({ app, onClick, size = 60, isLast }) => {
           : [])
       ]
 
-  if (!isVisible && !isLast) return null
+  if (!isVisible && !isLast) {
+    return null
+  }
 
   return (
     <>
       <Dropdown menu={{ items: menuItems }} trigger={['contextMenu']}>
         <Container onClick={handleClick}>
           {isLast ? (
-            <AddButton>
+            <AddButton size={size}>
               <PlusOutlined />
             </AddButton>
           ) : (
@@ -252,9 +254,9 @@ const AppTitle = styled.div`
   white-space: nowrap;
 `
 
-const AddButton = styled.div`
-  width: 60px;
-  height: 60px;
+const AddButton = styled.div<{ size?: number }>`
+  width: ${({ size }) => size || 60}px;
+  height: ${({ size }) => size || 60}px;
   border-radius: 12px;
   display: flex;
   align-items: center;
diff --git a/src/renderer/src/pages/home/Messages/Messages.tsx b/src/renderer/src/pages/home/Messages/Messages.tsx
index 58ee978fe2..84b89f0e43 100644
--- a/src/renderer/src/pages/home/Messages/Messages.tsx
+++ b/src/renderer/src/pages/home/Messages/Messages.tsx
@@ -256,6 +256,7 @@ const Messages: React.FC<MessagesProps> = ({ assistant, topic, setActiveTopic, o
 
   useEffect(() => {
     requestAnimationFrame(() => onComponentUpdate?.())
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [])
 
   const groupedMessages = useMemo(() => Object.entries(getGroupedMessages(displayMessages)), [displayMessages])
diff --git a/src/renderer/src/pages/home/Tabs/AssistantsTab.tsx b/src/renderer/src/pages/home/Tabs/AssistantsTab.tsx
index b2f291a837..537c7583f8 100644
--- a/src/renderer/src/pages/home/Tabs/AssistantsTab.tsx
+++ b/src/renderer/src/pages/home/Tabs/AssistantsTab.tsx
@@ -8,7 +8,7 @@ import { FC, useCallback, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import styled from 'styled-components'
 
-import AssistantItem from './AssistantItem'
+import AssistantItem from './components/AssistantItem'
 
 interface AssistantsTabProps {
   activeAssistant: Assistant
diff --git a/src/renderer/src/pages/home/Tabs/SettingsTab.tsx b/src/renderer/src/pages/home/Tabs/SettingsTab.tsx
index 6754ccdb43..a421a027f3 100644
--- a/src/renderer/src/pages/home/Tabs/SettingsTab.tsx
+++ b/src/renderer/src/pages/home/Tabs/SettingsTab.tsx
@@ -63,7 +63,7 @@ import { FC, useCallback, useEffect, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import styled from 'styled-components'
 
-import OpenAISettingsTab from './OpenAISettingsTab'
+import OpenAISettingsGroup from './components/OpenAISettingsGroup'
 
 interface Props {
   assistant: Assistant
@@ -218,8 +218,7 @@ const SettingsTab: FC<Props> = (props) => {
             />
           </HStack>
         }>
-        <SettingGroup style={{ marginTop: 10 }}>
-          <SettingDivider />
+        <SettingGroup style={{ marginTop: 5 }}>
           <Row align="middle">
             <Label>{t('chat.settings.temperature')}</Label>
             <Tooltip title={t('chat.settings.temperature.tip')}>
@@ -227,7 +226,7 @@ const SettingsTab: FC<Props> = (props) => {
             </Tooltip>
           </Row>
           <Row align="middle" gutter={10}>
-            <Col span={24}>
+            <div style={{ width: '100%' }}>
               <Slider
                 min={0}
                 max={2}
@@ -236,7 +235,7 @@ const SettingsTab: FC<Props> = (props) => {
                 value={typeof temperature === 'number' ? temperature : 0}
                 step={0.1}
               />
-            </Col>
+            </div>
           </Row>
           <Row align="middle">
             <Label>{t('chat.settings.context_count')}</Label>
@@ -245,7 +244,7 @@ const SettingsTab: FC<Props> = (props) => {
             </Tooltip>
           </Row>
           <Row align="middle" gutter={10}>
-            <Col span={24}>
+            <div style={{ width: '100%' }}>
               <Slider
                 min={0}
                 max={maxContextCount}
@@ -254,7 +253,7 @@ const SettingsTab: FC<Props> = (props) => {
                 value={typeof contextCount === 'number' ? contextCount : 0}
                 step={1}
               />
-            </Col>
+            </div>
           </Row>
           <SettingDivider />
           <SettingRow>
@@ -296,7 +295,7 @@ const SettingsTab: FC<Props> = (props) => {
             />
           </SettingRow>
           {enableMaxTokens && (
-            <Row align="middle" gutter={10}>
+            <Row align="middle" gutter={10} style={{ marginTop: 10 }}>
               <Col span={24}>
                 <InputNumber
                   disabled={!enableMaxTokens}
@@ -314,16 +313,17 @@ const SettingsTab: FC<Props> = (props) => {
           )}
           <SettingDivider />
         </SettingGroup>
-        {isOpenAI && (
-          <OpenAISettingsTab
-            isOpenAIReasoning={isOpenAIReasoning}
-            isSupportedFlexServiceTier={isOpenAIFlexServiceTier}
-          />
-        )}
       </CollapsibleSettingGroup>
+      {isOpenAI && (
+        <OpenAISettingsGroup
+          isOpenAIReasoning={isOpenAIReasoning}
+          isSupportedFlexServiceTier={isOpenAIFlexServiceTier}
+          SettingGroup={SettingGroup}
+          SettingRowTitleSmall={SettingRowTitleSmall}
+        />
+      )}
       <CollapsibleSettingGroup title={t('settings.messages.title')} defaultExpanded={true}>
         <SettingGroup>
-          <SettingDivider />
           <SettingRow>
             <SettingRowTitleSmall>{t('settings.messages.prompt')}</SettingRowTitleSmall>
             <Switch size="small" checked={showPrompt} onChange={(checked) => dispatch(setShowPrompt(checked))} />
@@ -440,7 +440,6 @@ const SettingsTab: FC<Props> = (props) => {
       </CollapsibleSettingGroup>
       <CollapsibleSettingGroup title={t('chat.settings.code.title')} defaultExpanded={true}>
         <SettingGroup>
-          <SettingDivider />
           <SettingRow>
             <SettingRowTitleSmall>{t('message.message.code_style')}</SettingRowTitleSmall>
             <StyledSelect
@@ -568,7 +567,6 @@ const SettingsTab: FC<Props> = (props) => {
       </CollapsibleSettingGroup>
       <CollapsibleSettingGroup title={t('settings.messages.input.title')} defaultExpanded={true}>
         <SettingGroup>
-          <SettingDivider />
           <SettingRow>
             <SettingRowTitleSmall>{t('settings.messages.input.show_estimated_tokens')}</SettingRowTitleSmall>
             <Switch
@@ -710,11 +708,11 @@ const Label = styled.p`
   margin-right: 5px;
 `
 
-export const SettingRowTitleSmall = styled(SettingRowTitle)`
+const SettingRowTitleSmall = styled(SettingRowTitle)`
   font-size: 13px;
 `
 
-export const SettingGroup = styled.div<{ theme?: ThemeMode }>`
+const SettingGroup = styled.div<{ theme?: ThemeMode }>`
   padding: 0 5px;
   width: 100%;
   margin-top: 0;
diff --git a/src/renderer/src/pages/home/Tabs/AssistantItem.tsx b/src/renderer/src/pages/home/Tabs/components/AssistantItem.tsx
similarity index 100%
rename from src/renderer/src/pages/home/Tabs/AssistantItem.tsx
rename to src/renderer/src/pages/home/Tabs/components/AssistantItem.tsx
diff --git a/src/renderer/src/pages/home/Tabs/OpenAISettingsTab.tsx b/src/renderer/src/pages/home/Tabs/components/OpenAISettingsGroup.tsx
similarity index 54%
rename from src/renderer/src/pages/home/Tabs/OpenAISettingsTab.tsx
rename to src/renderer/src/pages/home/Tabs/components/OpenAISettingsGroup.tsx
index 0fdd702d26..2aa25c5ff1 100644
--- a/src/renderer/src/pages/home/Tabs/OpenAISettingsTab.tsx
+++ b/src/renderer/src/pages/home/Tabs/components/OpenAISettingsGroup.tsx
@@ -1,4 +1,5 @@
-import { SettingDivider, SettingRow, SettingSubtitle } from '@renderer/pages/settings'
+import { SettingDivider, SettingRow } from '@renderer/pages/settings'
+import { CollapsibleSettingGroup } from '@renderer/pages/settings/SettingGroup'
 import { RootState, useAppDispatch } from '@renderer/store'
 import { setOpenAIServiceTier, setOpenAISummaryText } from '@renderer/store/settings'
 import { OpenAIServiceTier, OpenAISummaryText } from '@renderer/types'
@@ -9,11 +10,11 @@ import { useTranslation } from 'react-i18next'
 import { useSelector } from 'react-redux'
 import styled from 'styled-components'
 
-import { SettingGroup, SettingRowTitleSmall } from './SettingsTab'
-
 interface Props {
   isOpenAIReasoning: boolean
   isSupportedFlexServiceTier: boolean
+  SettingGroup: FC<{ children: React.ReactNode }>
+  SettingRowTitleSmall: FC<{ children: React.ReactNode }>
 }
 
 const FALL_BACK_SERVICE_TIER: Record<OpenAIServiceTier, OpenAIServiceTier> = {
@@ -22,7 +23,12 @@ const FALL_BACK_SERVICE_TIER: Record<OpenAIServiceTier, OpenAIServiceTier> = {
   flex: 'default'
 }
 
-const OpenAISettingsTab: FC<Props> = (props) => {
+const OpenAISettingsGroup: FC<Props> = ({
+  isOpenAIReasoning,
+  isSupportedFlexServiceTier,
+  SettingGroup,
+  SettingRowTitleSmall
+}) => {
   const { t } = useTranslation()
   const summaryText = useSelector((state: RootState) => state.settings.openAI.summaryText)
   const serviceTierMode = useSelector((state: RootState) => state.settings.openAI.serviceTier)
@@ -74,11 +80,11 @@ const OpenAISettingsTab: FC<Props> = (props) => {
     ]
     return baseOptions.filter((option) => {
       if (option.value === 'flex') {
-        return props.isSupportedFlexServiceTier
+        return isSupportedFlexServiceTier
       }
       return true
     })
-  }, [props.isSupportedFlexServiceTier, t])
+  }, [isSupportedFlexServiceTier, t])
 
   useEffect(() => {
     if (serviceTierMode && !serviceTierOptions.some((option) => option.value === serviceTierMode)) {
@@ -87,49 +93,49 @@ const OpenAISettingsTab: FC<Props> = (props) => {
   }, [serviceTierMode, serviceTierOptions, setServiceTierMode])
 
   return (
-    <SettingGroup>
-      <SettingSubtitle style={{ marginTop: 0 }}>{t('settings.openai.title')}</SettingSubtitle>
-      <SettingDivider />
-      <SettingRow>
-        <SettingRowTitleSmall>
-          {t('settings.openai.service_tier.title')}{' '}
-          <Tooltip title={t('settings.openai.service_tier.tip')}>
-            <CircleHelp size={14} style={{ marginLeft: 4 }} color="var(--color-text-2)" />
-          </Tooltip>
-        </SettingRowTitleSmall>
-        <StyledSelect
-          value={serviceTierMode}
-          style={{ width: 135 }}
-          onChange={(value) => {
-            setServiceTierMode(value as OpenAIServiceTier)
-          }}
-          size="small"
-          options={serviceTierOptions}
-        />
-      </SettingRow>
-      {props.isOpenAIReasoning && (
-        <>
-          <SettingDivider />
-          <SettingRow>
-            <SettingRowTitleSmall>
-              {t('settings.openai.summary_text_mode.title')}{' '}
-              <Tooltip title={t('settings.openai.summary_text_mode.tip')}>
-                <CircleHelp size={14} style={{ marginLeft: 4 }} color="var(--color-text-2)" />
-              </Tooltip>
-            </SettingRowTitleSmall>
-            <StyledSelect
-              value={summaryText}
-              style={{ width: 135 }}
-              onChange={(value) => {
-                setSummaryText(value as OpenAISummaryText)
-              }}
-              size="small"
-              options={summaryTextOptions}
-            />
-          </SettingRow>
-        </>
-      )}
-    </SettingGroup>
+    <CollapsibleSettingGroup title={t('settings.openai.title')} defaultExpanded={true}>
+      <SettingGroup>
+        <SettingRow>
+          <SettingRowTitleSmall>
+            {t('settings.openai.service_tier.title')}{' '}
+            <Tooltip title={t('settings.openai.service_tier.tip')}>
+              <CircleHelp size={14} style={{ marginLeft: 4 }} color="var(--color-text-2)" />
+            </Tooltip>
+          </SettingRowTitleSmall>
+          <StyledSelect
+            value={serviceTierMode}
+            style={{ width: 135 }}
+            onChange={(value) => {
+              setServiceTierMode(value as OpenAIServiceTier)
+            }}
+            size="small"
+            options={serviceTierOptions}
+          />
+        </SettingRow>
+        {isOpenAIReasoning && (
+          <>
+            <SettingDivider />
+            <SettingRow>
+              <SettingRowTitleSmall>
+                {t('settings.openai.summary_text_mode.title')}{' '}
+                <Tooltip title={t('settings.openai.summary_text_mode.tip')}>
+                  <CircleHelp size={14} style={{ marginLeft: 4 }} color="var(--color-text-2)" />
+                </Tooltip>
+              </SettingRowTitleSmall>
+              <StyledSelect
+                value={summaryText}
+                style={{ width: 135 }}
+                onChange={(value) => {
+                  setSummaryText(value as OpenAISummaryText)
+                }}
+                size="small"
+                options={summaryTextOptions}
+              />
+            </SettingRow>
+          </>
+        )}
+      </SettingGroup>
+    </CollapsibleSettingGroup>
   )
 }
 
@@ -141,4 +147,4 @@ const StyledSelect = styled(Select)`
   }
 `
 
-export default OpenAISettingsTab
+export default OpenAISettingsGroup
diff --git a/src/renderer/src/pages/settings/QuickPhraseSettings/index.tsx b/src/renderer/src/pages/settings/QuickPhraseSettings/index.tsx
index 1321a87db1..ea4a16a532 100644
--- a/src/renderer/src/pages/settings/QuickPhraseSettings/index.tsx
+++ b/src/renderer/src/pages/settings/QuickPhraseSettings/index.tsx
@@ -1,5 +1,6 @@
 import { DeleteOutlined, EditOutlined, ExclamationCircleOutlined, PlusOutlined } from '@ant-design/icons'
 import DragableList from '@renderer/components/DragableList'
+import { useTheme } from '@renderer/context/ThemeProvider'
 import FileItem from '@renderer/pages/files/FileItem'
 import QuickPhraseService from '@renderer/services/QuickPhraseService'
 import { QuickPhrase } from '@renderer/types'
@@ -19,6 +20,7 @@ const QuickPhraseSettings: FC = () => {
   const [editingPhrase, setEditingPhrase] = useState<QuickPhrase | null>(null)
   const [formData, setFormData] = useState({ title: '', content: '' })
   const [dragging, setDragging] = useState(false)
+  const { theme } = useTheme()
 
   const loadPhrases = async () => {
     const data = await QuickPhraseService.getAll()
@@ -68,8 +70,8 @@ const QuickPhraseSettings: FC = () => {
   const reversedPhrases = [...phrasesList].reverse()
 
   return (
-    <SettingContainer>
-      <SettingGroup style={{ marginBottom: 0 }}>
+    <SettingContainer theme={theme}>
+      <SettingGroup style={{ marginBottom: 0 }} theme={theme}>
         <SettingTitle>
           {t('settings.quickPhrase.title')}
           <Button type="text" icon={<PlusOutlined />} onClick={handleAdd} />
diff --git a/src/renderer/src/pages/settings/SettingGroup.tsx b/src/renderer/src/pages/settings/SettingGroup.tsx
index 7948c20390..bd5efc70cc 100644
--- a/src/renderer/src/pages/settings/SettingGroup.tsx
+++ b/src/renderer/src/pages/settings/SettingGroup.tsx
@@ -46,8 +46,11 @@ const GroupHeader = styled.div`
   display: flex;
   align-items: center;
   cursor: pointer;
-  padding: 6px 0;
+  padding: 8px 0;
+  padding-bottom: 12px;
   user-select: none;
+  margin-bottom: 10px;
+  border-bottom: 0.5px solid var(--color-border);
 `
 
 const GroupTitle = styled.div`
diff --git a/src/renderer/src/services/BackupService.ts b/src/renderer/src/services/BackupService.ts
index 3d3bbf1e38..231ef49fc9 100644
--- a/src/renderer/src/services/BackupService.ts
+++ b/src/renderer/src/services/BackupService.ts
@@ -1,3 +1,4 @@
+/* eslint-disable simple-import-sort/imports */
 import Logger from '@renderer/config/logger'
 import db from '@renderer/databases'
 import { upgradeToV7 } from '@renderer/databases/upgrades'
diff --git a/src/renderer/src/services/MessagesService.ts b/src/renderer/src/services/MessagesService.ts
index a20f481f6c..b27f24836f 100644
--- a/src/renderer/src/services/MessagesService.ts
+++ b/src/renderer/src/services/MessagesService.ts
@@ -217,7 +217,7 @@ export async function getMessageTitle(message: Message, length = 30): Promise<st
 
       const tempMessage = resetMessage(message, {
         status: AssistantMessageStatus.SUCCESS,
-        blocks: message.blocks,
+        blocks: message.blocks
       })
 
       const title = await fetchMessagesSummary({ messages: [tempMessage], assistant: {} as Assistant })
diff --git a/src/renderer/src/store/migrate.ts b/src/renderer/src/store/migrate.ts
index 3261e0e329..6d0b373cbb 100644
--- a/src/renderer/src/store/migrate.ts
+++ b/src/renderer/src/store/migrate.ts
@@ -1406,6 +1406,8 @@ const migrateConfig = {
           searchMessageShortcut.shortcut = [isMac ? 'Command' : 'Ctrl', 'Shift', 'F']
         }
       }
+      // Quick assistant model
+      state.llm.quickAssistantModel = state.llm.defaultModel || SYSTEM_MODELS.silicon[1]
       return state
     } catch (error) {
       return state