diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0cca34cb..4db1811f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -885,6 +885,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Suggested Songs now show the favorite heart and star rating like the playlist above, so the Favorite/Rating columns no longer leave an empty gap.
 * Tracks with several artists split into individually clickable names, matching the rest of the app — and reading the same before and after you add the track.
 
+### Small windows — usable layout when scaled down
+
+**By [@Psychotoxical](https://github.com/Psychotoxical), reported by zunoz on Discord, PR [#981](https://github.com/Psychotoxical/psysonic/pull/981)**
+
+* Browse toolbars (Albums, Artists, …) collapse their filter buttons to icons on a narrow window instead of wrapping into rows that pushed the list off-screen; hover or focus still shows each button's label.
+* The minimum window size is a touch larger so the layout can no longer be shrunk past the point where it breaks.
+* On a short window the Now Playing cover scales down to fit instead of overlapping the track title.
+
 ## [1.46.0] - 2026-05-18
 
 > **🙏 Special thanks to [@zz5zz](https://github.com/zz5zz)** for his tireless quirk-spotting and bug reports on the [Psysonic Discord](https://discord.gg/AMnDRErm4u) — several of the polish fixes in this release landed directly off the back of his messages.
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index b36e9b5c..37a1f0da 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -16,8 +16,8 @@
         "title": "Psysonic",
         "width": 1280,
         "height": 800,
-        "minWidth": 360,
-        "minHeight": 480,
+        "minWidth": 520,
+        "minHeight": 640,
         "resizable": true,
         "fullscreen": false,
         "decorations": true,
diff --git a/src/components/GenreFilterBar.tsx b/src/components/GenreFilterBar.tsx
index 309e3eb6..85bb94be 100644
--- a/src/components/GenreFilterBar.tsx
+++ b/src/components/GenreFilterBar.tsx
@@ -158,7 +158,7 @@ export default function GenreFilterBar({
         style={{ display: 'flex', alignItems: 'center', gap: '0.4rem' }}
       >
         <Filter size={14} />
-        {t('common.filterGenre')}
+        <span className="toolbar-btn-label">{t('common.filterGenre')}</span>
         {count > 0 && <span className="genre-filter-count">{count}</span>}
         {count > 0 && <FilterQuickClear onActiveChip onClear={clear} />}
       </button>
diff --git a/src/components/LosslessFilterButton.tsx b/src/components/LosslessFilterButton.tsx
index e38d4f53..3d87e87b 100644
--- a/src/components/LosslessFilterButton.tsx
+++ b/src/components/LosslessFilterButton.tsx
@@ -25,7 +25,7 @@ export default function LosslessFilterButton({ active, onChange }: Props) {
       }}
     >
       <Gem size={14} />
-      {t('albums.losslessLabel')}
+      <span className="toolbar-btn-label">{t('albums.losslessLabel')}</span>
       {active && <FilterQuickClear onActiveChip onClear={() => onChange(false)} />}
     </button>
   );
diff --git a/src/components/SortDropdown.tsx b/src/components/SortDropdown.tsx
index 0a0790eb..d4a118c8 100644
--- a/src/components/SortDropdown.tsx
+++ b/src/components/SortDropdown.tsx
@@ -98,7 +98,7 @@ export default function SortDropdown<V extends string>({ value, options, onChang
         style={{ display: 'flex', alignItems: 'center', gap: '0.4rem' }}
       >
         <ArrowDownUp size={14} />
-        {current?.label ?? value}
+        <span className="toolbar-btn-label">{current?.label ?? value}</span>
       </button>
 
       {open && createPortal(
diff --git a/src/components/StarFilterButton.tsx b/src/components/StarFilterButton.tsx
index f4c2e3e6..21b75434 100644
--- a/src/components/StarFilterButton.tsx
+++ b/src/components/StarFilterButton.tsx
@@ -62,7 +62,7 @@ export default function StarFilterButton({ active, onChange, size = 'default' }:
       }}
     >
       <Star size={14} fill={active ? 'currentColor' : 'none'} />
-      {t('common.favorites')}
+      <span className="toolbar-btn-label">{t('common.favorites')}</span>
       {active && <FilterQuickClear onActiveChip onClear={() => onChange(false)} />}
     </button>
   );
diff --git a/src/components/YearFilterButton.tsx b/src/components/YearFilterButton.tsx
index 3209d719..40c63598 100644
--- a/src/components/YearFilterButton.tsx
+++ b/src/components/YearFilterButton.tsx
@@ -144,7 +144,7 @@ export default function YearFilterButton({
         }}
       >
         <CalendarRange size={14} />
-        {active && activeLabel ? activeLabel : t('albums.yearFilterLabel')}
+        <span className="toolbar-btn-label">{active && activeLabel ? activeLabel : t('albums.yearFilterLabel')}</span>
         {active && <FilterQuickClear onActiveChip onClear={clear} />}
       </button>
 
diff --git a/src/pages/Albums.tsx b/src/pages/Albums.tsx
index b8b163cf..f6b689af 100644
--- a/src/pages/Albums.tsx
+++ b/src/pages/Albums.tsx
@@ -365,17 +365,17 @@ export default function Albums() {
             <div style={{ display: 'flex', alignItems: 'center', gap: '0.5rem', flexWrap: 'wrap' }}>
               {selectionMode && selectedIds.size > 0 ? (
                 <>
-                  <button className="btn btn-surface albums-selection-action-btn" onClick={handleEnqueueSelected}>
+                  <button className="btn btn-surface albums-selection-action-btn" onClick={handleEnqueueSelected} data-tooltip={t('albums.enqueueSelected', { count: selectedIds.size })} data-tooltip-pos="bottom">
                     <ListPlus size={15} />
-                    {t('albums.enqueueSelected', { count: selectedIds.size })}
+                    <span className="toolbar-btn-label">{t('albums.enqueueSelected', { count: selectedIds.size })}</span>
                   </button>
-                  <button className="btn btn-surface albums-selection-action-btn" onClick={handleAddOffline}>
+                  <button className="btn btn-surface albums-selection-action-btn" onClick={handleAddOffline} data-tooltip={t('albums.addOffline')} data-tooltip-pos="bottom">
                     <HardDriveDownload size={15} />
-                    {t('albums.addOffline')}
+                    <span className="toolbar-btn-label">{t('albums.addOffline')}</span>
                   </button>
-                  <button className="btn btn-surface albums-selection-action-btn" onClick={handleDownloadZips}>
+                  <button className="btn btn-surface albums-selection-action-btn" onClick={handleDownloadZips} data-tooltip={t('albums.downloadZips')} data-tooltip-pos="bottom">
                     <Download size={15} />
-                    {t('albums.downloadZips')}
+                    <span className="toolbar-btn-label">{t('albums.downloadZips')}</span>
                   </button>
                 </>
               ) : (
@@ -422,9 +422,11 @@ export default function Albums() {
                     }}
                   >
                     <Disc3 size={14} />
-                    {compFilter === 'all' ? t('albums.compilationLabel')
-                      : compFilter === 'only' ? t('albums.compilationOnly')
-                      : t('albums.compilationHide')}
+                    <span className="toolbar-btn-label">
+                      {compFilter === 'all' ? t('albums.compilationLabel')
+                        : compFilter === 'only' ? t('albums.compilationOnly')
+                        : t('albums.compilationHide')}
+                    </span>
                     {compFilter !== 'all' && (
                       <FilterQuickClear onActiveChip onClear={() => setCompFilter('all')} />
                     )}
@@ -440,7 +442,7 @@ export default function Albums() {
                 style={selectionMode ? { background: 'var(--accent)', color: 'var(--ctp-crust)' } : {}}
               >
                 <CheckSquare2 size={15} />
-                {selectionMode ? t('albums.cancelSelect') : t('albums.select')}
+                <span className="toolbar-btn-label">{selectionMode ? t('albums.cancelSelect') : t('albums.select')}</span>
               </button>
             </div>
           </div>
diff --git a/src/styles/layout/cover-art.css b/src/styles/layout/cover-art.css
index 315c30db..0f9564b4 100644
--- a/src/styles/layout/cover-art.css
+++ b/src/styles/layout/cover-art.css
@@ -8,8 +8,15 @@
 }
 
 .mp-cover {
-  width: min(calc(100vw - 28px), 55vh);
-  max-width: 440px;
+  /* Largest square that fits BOTH the viewport width and the height the flex
+     column leaves for the cover. `max-height: 100%` ties the image to its
+     (shrinkable) wrap, so on a short window it scales down instead of growing
+     past its slot and overlapping the title (zunoz, RC2 small-window report).
+     `width/height: auto` + `aspect-ratio` keep it square while it shrinks. */
+  max-width: min(calc(100vw - 28px), 440px);
+  max-height: 100%;
+  width: auto;
+  height: auto;
   aspect-ratio: 1;
   object-fit: cover;
   border-radius: 14px;
diff --git a/src/styles/layout/main-content.css b/src/styles/layout/main-content.css
index 09c9079b..c0399614 100644
--- a/src/styles/layout/main-content.css
+++ b/src/styles/layout/main-content.css
@@ -180,6 +180,15 @@
   min-height: 0;
 }
 
+/* Compact mode: the sticky toolbar is `flex-shrink: 0`, so labelled filter
+   buttons wrap into several rows on a narrow window and starve the `flex: 1`
+   list below them, clipping the album grid (zunoz, RC2). Collapse the toolbar
+   buttons to icon-only (label hidden, icon + tooltip + aria-label kept) so the
+   row stays short and the list keeps its height. */
+.app-shell[data-mobile] .mainstage-inpage-toolbar .toolbar-btn-label {
+  display: none;
+}
+
 .mainstage-inpage-scroll__viewport {
   padding-bottom: var(--space-6);
   padding-right: var(--space-6);