diff --git a/CHANGELOG.md b/CHANGELOG.md
index ff1817b3..af39bf27 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -127,19 +127,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Fixed
 
-### Context menu "Play Now" and resize behaviour
-
-**By [@Psychotoxical](https://github.com/Psychotoxical), PR [#1174](https://github.com/Psychotoxical/psysonic/pull/1174)**, reported by [@peri4ko](https://github.com/peri4ko)
-
-* On the Playlists page, right-clicking a playlist and choosing "Play Now" only opened the playlist instead of playing it. It now starts playback.
-* Resizing the window while a context menu was open could leave the menu stranded and drifting off-screen. The context menu now closes when the window is resized.
-
-### Artist header showing the plain image instead of the external background
-
-**By [@Psychotoxical](https://github.com/Psychotoxical), PR [#1172](https://github.com/Psychotoxical/psysonic/pull/1172)**
-
-* On the artist page, when an artist had an external background image (from fanart.tv) but no banner, the header showed the plain Navidrome artist image instead of the background — even though the fullscreen player used the background correctly. The header now falls back banner → background → Navidrome image as intended. The background also sits a little higher so band members' heads aren't cropped on wide screens.
-
 ### Playlists header buttons clipped at narrow widths
 
 **By [@Psychotoxical](https://github.com/Psychotoxical), PR [#1153](https://github.com/Psychotoxical/psysonic/pull/1153)**
@@ -288,6 +275,25 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Strict `npm run lint` runs in CI on frontend path filters via a dedicated workflow parallel to the existing frontend test jobs.
 * The `ci-ok` check waits for every applicable test and lint job on a PR (frontend and/or Rust, depending on changed paths) and blocks merge when any required job failed or did not finish in time.
 
+### Artist header showing the plain image instead of the external background
+
+**By [@Psychotoxical](https://github.com/Psychotoxical), PR [#1172](https://github.com/Psychotoxical/psysonic/pull/1172)**
+
+* On the artist page, when an artist had an external background image (from fanart.tv) but no banner, the header showed the plain Navidrome artist image instead of the background — even though the fullscreen player used the background correctly. The header now falls back banner → background → Navidrome image as intended. The background also sits a little higher so band members' heads aren't cropped on wide screens.
+
+### Context menu "Play Now" and resize behaviour
+
+**By [@Psychotoxical](https://github.com/Psychotoxical), PR [#1174](https://github.com/Psychotoxical/psysonic/pull/1174)**, reported by [@peri4ko](https://github.com/peri4ko)
+
+* On the Playlists page, right-clicking a playlist and choosing "Play Now" only opened the playlist instead of playing it. It now starts playback.
+* Resizing the window while a context menu was open could leave the menu stranded and drifting off-screen. The context menu now closes when the window is resized.
+
+### Settings — consistent design for the Audio sub-sections
+
+**By [@Psychotoxical](https://github.com/Psychotoxical), PR [#1175](https://github.com/Psychotoxical/psysonic/pull/1175)**
+
+* The AutoDJ overlap-cap and the Native Hi-Res blend-rate options in Settings → Audio now sit in the same bordered sub-card the Normalization options use, and the Hi-Res section no longer shows a double border.
+
 ## [1.48.1] - 2026-06-15
 
 ## Fixed
diff --git a/src/components/settings/audio/HiResCrossfadeResampleBlock.tsx b/src/components/settings/audio/HiResCrossfadeResampleBlock.tsx
index 166f575a..8e3d42e6 100644
--- a/src/components/settings/audio/HiResCrossfadeResampleBlock.tsx
+++ b/src/components/settings/audio/HiResCrossfadeResampleBlock.tsx
@@ -4,7 +4,6 @@ import {
   sanitizeHiResCrossfadeResampleHz,
 } from '../../../utils/audio/hiResCrossfadeResample';
 import type { TFunction } from 'i18next';
-import { SettingsGroup } from '../SettingsGroup';
 
 interface Props {
   enabled: boolean;
@@ -29,28 +28,28 @@ export function HiResCrossfadeResampleBlock({
   if (!enabled) return null;
 
   return (
-    <SettingsGroup>
-      <p className="settings-row-label" style={{ marginBottom: '0.5rem' }}>
-        {t('settings.hiResCrossfadeResampleTitle')}
-      </p>
-      <p className="settings-row-desc" style={{ marginBottom: '0.75rem' }}>
-        {t('settings.hiResCrossfadeResampleDesc')}
-      </p>
-      <div className="settings-segmented" style={{ marginBottom: '0.75rem' }}>
-        {HI_RES_CROSSFADE_RESAMPLE_OPTIONS.map((hz) => (
-          <button
-            key={hz}
-            type="button"
-            className={`btn ${resampleHz === hz ? 'btn-primary' : 'btn-ghost'}`}
-            onClick={() => onResampleHzChange(sanitizeHiResCrossfadeResampleHz(hz))}
-          >
-            {labelForHz(t, hz)}
-          </button>
-        ))}
+    <div className="settings-norm-block" style={{ marginTop: '0.85rem' }}>
+      <div className="settings-norm-field">
+        <span className="settings-norm-label" style={{ minWidth: 0 }}>
+          {t('settings.hiResCrossfadeResampleTitle')}
+        </span>
+        <div className="settings-norm-help">{t('settings.hiResCrossfadeResampleDesc')}</div>
+        <div className="settings-segmented">
+          {HI_RES_CROSSFADE_RESAMPLE_OPTIONS.map((hz) => (
+            <button
+              key={hz}
+              type="button"
+              className={`btn ${resampleHz === hz ? 'btn-primary' : 'btn-ghost'}`}
+              onClick={() => onResampleHzChange(sanitizeHiResCrossfadeResampleHz(hz))}
+            >
+              {labelForHz(t, hz)}
+            </button>
+          ))}
+        </div>
+        <div className="settings-norm-help" role="note">
+          {t('settings.hiResCrossfadeResampleWarning')}
+        </div>
       </div>
-      <p className="settings-row-desc" role="note" style={{ marginBottom: 0, opacity: 0.85 }}>
-        {t('settings.hiResCrossfadeResampleWarning')}
-      </p>
-    </SettingsGroup>
+    </div>
   );
 }
diff --git a/src/components/settings/audio/TrackTransitionsBlock.tsx b/src/components/settings/audio/TrackTransitionsBlock.tsx
index cc1bc909..1e3425c5 100644
--- a/src/components/settings/audio/TrackTransitionsBlock.tsx
+++ b/src/components/settings/audio/TrackTransitionsBlock.tsx
@@ -70,36 +70,33 @@ export function TrackTransitionsBlock({ t }: Props) {
       </div>
 
       {mode === 'crossfade' && (
-        <div style={{ paddingLeft: '1rem', marginTop: '0.7rem', display: 'flex', alignItems: 'center', gap: '0.75rem', flexWrap: 'wrap' }}>
-          <input
-            type="range"
-            min={0.1}
-            max={10}
-            step={0.1}
-            value={auth.crossfadeSecs}
-            disabled={hostControlled}
-            onChange={e => auth.setCrossfadeSecs(parseFloat(e.target.value))}
-            style={{ flex: 1, minWidth: 80, maxWidth: 200 }}
-            id="crossfade-secs-slider"
-          />
-          <span style={{ fontSize: 13, color: 'var(--text-secondary)', minWidth: 36 }}>
-            {t('settings.crossfadeSecs', { n: auth.crossfadeSecs.toFixed(1) })}
-          </span>
+        <div className="settings-norm-block" style={{ marginTop: '0.85rem' }}>
+          <div className="settings-norm-row">
+            <input
+              type="range"
+              min={0.1}
+              max={10}
+              step={0.1}
+              value={auth.crossfadeSecs}
+              disabled={hostControlled}
+              onChange={e => auth.setCrossfadeSecs(parseFloat(e.target.value))}
+              id="crossfade-secs-slider"
+            />
+            <span className="settings-norm-value">
+              {t('settings.crossfadeSecs', { n: auth.crossfadeSecs.toFixed(1) })}
+            </span>
+          </div>
         </div>
       )}
       {mode === 'autodj' && (
-        <>
-          <div style={{ paddingLeft: '1rem', fontSize: 12, color: 'var(--text-muted)', marginTop: '0.7rem' }}>
-            {t('settings.autoDjDesc')}
-          </div>
-          <div style={{ paddingLeft: '1rem', marginTop: '0.9rem' }}>
-            <p className="settings-row-label" style={{ marginBottom: '0.45rem' }}>
+        <div className="settings-norm-block" style={{ marginTop: '0.85rem' }}>
+          <div className="settings-norm-help">{t('settings.autoDjDesc')}</div>
+          <div className="settings-norm-field">
+            <span className="settings-norm-label" style={{ minWidth: 0 }}>
               {t('settings.autodjOverlapCapTitle')}
-            </p>
-            <p className="settings-row-desc" style={{ marginBottom: '0.6rem' }}>
-              {t('settings.autodjOverlapCapDesc')}
-            </p>
-            <div className="settings-segmented" style={{ marginBottom: auth.autodjOverlapCapMode === 'limit' ? '0.65rem' : 0 }}>
+            </span>
+            <div className="settings-norm-help">{t('settings.autodjOverlapCapDesc')}</div>
+            <div className="settings-segmented">
               <button
                 type="button"
                 className={`btn ${auth.autodjOverlapCapMode === 'auto' ? 'btn-primary' : 'btn-ghost'}`}
@@ -118,7 +115,7 @@ export function TrackTransitionsBlock({ t }: Props) {
               </button>
             </div>
             {auth.autodjOverlapCapMode === 'limit' && (
-              <div style={{ display: 'flex', alignItems: 'center', gap: '0.75rem', flexWrap: 'wrap' }}>
+              <div className="settings-norm-row">
                 <input
                   type="range"
                   min={AUTODJ_OVERLAP_CAP_MIN_SEC}
@@ -127,25 +124,22 @@ export function TrackTransitionsBlock({ t }: Props) {
                   value={auth.autodjOverlapCapSec}
                   disabled={hostControlled}
                   onChange={e => auth.setAutodjOverlapCapSec(parseInt(e.target.value, 10))}
-                  style={{ flex: 1, minWidth: 80, maxWidth: 200 }}
                   id="autodj-overlap-cap-slider"
                 />
-                <span style={{ fontSize: 13, color: 'var(--text-secondary)', minWidth: 48 }}>
+                <span className="settings-norm-value">
                   {t('settings.autodjOverlapCapSecs', { n: auth.autodjOverlapCapSec })}
                 </span>
               </div>
             )}
           </div>
-          <div style={{ paddingLeft: '1rem', marginTop: '0.7rem' }}>
-            <SettingsToggle
-              label={t('settings.autodjSmoothSkip')}
-              desc={t('settings.autodjSmoothSkipDesc')}
-              checked={auth.autodjSmoothSkip}
-              disabled={hostControlled}
-              onChange={auth.setAutodjSmoothSkip}
-            />
-          </div>
-        </>
+          <SettingsToggle
+            label={t('settings.autodjSmoothSkip')}
+            desc={t('settings.autodjSmoothSkipDesc')}
+            checked={auth.autodjSmoothSkip}
+            disabled={hostControlled}
+            onChange={auth.setAutodjSmoothSkip}
+          />
+        </div>
       )}
     </SettingsGroup>
   );