diff --git a/src/renderer/src/settings/HighlightTab.tsx b/src/renderer/src/settings/HighlightTab.tsx
index d2ccced..394c5f0 100644
--- a/src/renderer/src/settings/HighlightTab.tsx
+++ b/src/renderer/src/settings/HighlightTab.tsx
@@ -282,69 +282,73 @@ export function HighlightTab(): React.JSX.Element {
         message={t('settings.highlight.alert')}
       />
       <div className="hl-toolbar">
-        <Tooltip title={t('settings.highlight.modeDesc')}>
-          <span className="hl-master">
-            <span className="hl-editor-sub-label">{t('settings.highlight.mode')}</span>
-            <Segmented
-              size="small"
-              value={highlightMode}
-              onChange={(value) => void updateTerminal({ highlightMode: value as HighlightMode })}
-              options={[
-                { value: 'all', label: t('settings.highlight.modeAll') },
-                { value: 'basic', label: t('settings.highlight.modeBasic') },
-                { value: 'off', label: t('settings.highlight.modeOff') }
-              ]}
-            />
-          </span>
-        </Tooltip>
-        <Tooltip title={t('settings.highlight.groupByCategory')}>
-          <span className="hl-master">
-            <Switch
-              size="small"
-              checked={groupByCategory}
-              onChange={(checked) => void updateTerminal({ highlightGroupByCategory: checked })}
-            />
-            <span className="hl-editor-sub-label">{t('settings.highlight.groupByCategory')}</span>
-          </span>
-        </Tooltip>
-        <Tooltip title={t('settings.highlight.statsHint')}>
-          <span className="hl-master">
-            <Switch
-              size="small"
-              checked={statsOn}
-              onChange={(checked) => void updateTerminal({ highlightStats: checked })}
-            />
-            <span className="hl-editor-sub-label">{t('settings.highlight.stats')}</span>
-          </span>
-        </Tooltip>
-        {statsOn && (
-          <Button size="small" onClick={() => resetHighlightStats()}>
-            {t('settings.highlight.statsReset')}
+        <div className="hl-toolbar-controls">
+          <Tooltip title={t('settings.highlight.modeDesc')}>
+            <span className="hl-master">
+              <span className="hl-editor-sub-label">{t('settings.highlight.mode')}</span>
+              <Segmented
+                size="small"
+                value={highlightMode}
+                onChange={(value) => void updateTerminal({ highlightMode: value as HighlightMode })}
+                options={[
+                  { value: 'all', label: t('settings.highlight.modeAll') },
+                  { value: 'basic', label: t('settings.highlight.modeBasic') },
+                  { value: 'off', label: t('settings.highlight.modeOff') }
+                ]}
+              />
+            </span>
+          </Tooltip>
+          <Tooltip title={t('settings.highlight.groupByCategory')}>
+            <span className="hl-master">
+              <Switch
+                size="small"
+                checked={groupByCategory}
+                onChange={(checked) => void updateTerminal({ highlightGroupByCategory: checked })}
+              />
+              <span className="hl-editor-sub-label">{t('settings.highlight.groupByCategory')}</span>
+            </span>
+          </Tooltip>
+          <Tooltip title={t('settings.highlight.statsHint')}>
+            <span className="hl-master">
+              <Switch
+                size="small"
+                checked={statsOn}
+                onChange={(checked) => void updateTerminal({ highlightStats: checked })}
+              />
+              <span className="hl-editor-sub-label">{t('settings.highlight.stats')}</span>
+            </span>
+          </Tooltip>
+          {statsOn && (
+            <Button size="small" onClick={() => resetHighlightStats()}>
+              {t('settings.highlight.statsReset')}
+            </Button>
+          )}
+          <Tooltip title={t('settings.highlight.themeColorsHint')}>
+            <span className="hl-master">
+              <Switch
+                size="small"
+                checked={themeColorsOn}
+                onChange={(checked) => void updateTerminal({ highlightThemeColors: checked })}
+              />
+              <span className="hl-editor-sub-label">{t('settings.highlight.themeColors')}</span>
+            </span>
+          </Tooltip>
+        </div>
+        <div className="hl-toolbar-actions">
+          <Button onClick={() => setIoOpen(true)}>{t('settings.highlight.importExport')}</Button>
+          <Popconfirm
+            title={t('settings.highlight.resetTitle')}
+            description={t('settings.highlight.resetDesc')}
+            okText={t('settings.highlight.resetOk')}
+            cancelText={t('common.cancel')}
+            onConfirm={() => void handleReset()}
+          >
+            <Button>{t('common.reset')}</Button>
+          </Popconfirm>
+          <Button type="primary" onClick={openCreate}>
+            {t('settings.highlight.addRule')}
           </Button>
-        )}
-        <Tooltip title={t('settings.highlight.themeColorsHint')}>
-          <span className="hl-master">
-            <Switch
-              size="small"
-              checked={themeColorsOn}
-              onChange={(checked) => void updateTerminal({ highlightThemeColors: checked })}
-            />
-            <span className="hl-editor-sub-label">{t('settings.highlight.themeColors')}</span>
-          </span>
-        </Tooltip>
-        <Button onClick={() => setIoOpen(true)}>{t('settings.highlight.importExport')}</Button>
-        <Popconfirm
-          title={t('settings.highlight.resetTitle')}
-          description={t('settings.highlight.resetDesc')}
-          okText={t('settings.highlight.resetOk')}
-          cancelText={t('common.cancel')}
-          onConfirm={() => void handleReset()}
-        >
-          <Button>{t('common.reset')}</Button>
-        </Popconfirm>
-        <Button type="primary" onClick={openCreate}>
-          {t('settings.highlight.addRule')}
-        </Button>
+        </div>
       </div>
       <HighlightImportExport open={ioOpen} onClose={() => setIoOpen(false)} />
       <HighlightProfiles />
diff --git a/src/renderer/src/settings/highlight.css b/src/renderer/src/settings/highlight.css
index c3740d9..b26c55a 100644
--- a/src/renderer/src/settings/highlight.css
+++ b/src/renderer/src/settings/highlight.css
@@ -14,11 +14,32 @@
 
 .hl-toolbar {
   display: flex;
-  justify-content: flex-end;
+  flex-wrap: wrap;
+  justify-content: flex-start;
   gap: 8px;
   align-items: center;
 }
 
+/* Left group (the switches) and right group (the buttons) each wrap on their
+   own, so a narrow settings pane never squeezes a label into vertical text. */
+.hl-toolbar-controls,
+.hl-toolbar-actions {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  gap: 8px;
+}
+
+.hl-toolbar-controls {
+  min-width: 0;
+}
+
+/* `margin-left: auto` rather than `justify-content: space-between`: the buttons
+   stay against the right edge even on the line they wrap onto. */
+.hl-toolbar-actions {
+  margin-left: auto;
+}
+
 .hl-table .ant-table {
   background: transparent;
 }
@@ -109,12 +130,14 @@
   min-width: 74px;
 }
 
-/* master switch sits on the left of the toolbar */
+/* A switch plus its caption. Never shrinks and never wraps: the caption is a
+   single word in some languages and a four-character phrase in others. */
 .hl-master {
   display: inline-flex;
   align-items: center;
   gap: 6px;
-  margin-right: auto;
+  flex: none;
+  white-space: nowrap;
   cursor: help;
 }
 
@@ -142,6 +165,15 @@
   display: flex;
   flex-direction: column;
   gap: 8px;
+  padding: 10px 12px;
+  border: 1px solid var(--chrome-border);
+  border-radius: 6px;
+  background: color-mix(in srgb, var(--chrome-fg, #cccccc) 2%, transparent);
+}
+
+/* the shared hint class centres itself; under this header it reads as stray text */
+.hl-profiles > .hl-editor-hint {
+  align-self: flex-start;
 }
 
 .hl-profiles-head {
@@ -233,7 +265,10 @@
 }
 
 .hl-editor-label {
-  flex: 0 0 56px;
+  /* a fixed width forced longer captions ("包含的规则") onto two lines */
+  flex: 0 0 auto;
+  min-width: 56px;
+  white-space: nowrap;
   color: color-mix(in srgb, var(--chrome-fg, #cccccc) 88%, transparent);
   padding-top: 5px;
 }