diff --git a/web_server.py b/web_server.py
index 33458305..95ca611c 100644
--- a/web_server.py
+++ b/web_server.py
@@ -38629,10 +38629,14 @@ def watchlist_artist_link_provider(artist_id):
             return jsonify({"success": False, "error": "No data provided"}), 400
 
         new_provider_id = data.get('provider_id', '').strip()
-        provider = data.get('provider', '').strip()  # 'spotify', 'itunes', or 'deezer'
+        provider = data.get('provider', '').strip()
 
-        if not new_provider_id or provider not in ('spotify', 'itunes', 'deezer'):
-            return jsonify({"success": False, "error": "Missing provider or provider_id"}), 400
+        valid_providers = ('spotify', 'itunes', 'deezer', 'discogs')
+        if provider not in valid_providers:
+            return jsonify({"success": False, "error": f"Invalid provider. Must be one of: {', '.join(valid_providers)}"}), 400
+
+        # Empty provider_id = clear the match for this source
+        is_clear = not new_provider_id
 
         conn = sqlite3.connect(str(database.database_path))
         cursor = conn.cursor()
@@ -38653,22 +38657,27 @@ def watchlist_artist_link_provider(artist_id):
         artist_name = row[1]
 
         # Check for duplicate — another watchlist artist already has this provider ID
-        col_map = {'spotify': 'spotify_artist_id', 'itunes': 'itunes_artist_id', 'deezer': 'deezer_artist_id'}
+        col_map = {'spotify': 'spotify_artist_id', 'itunes': 'itunes_artist_id', 'deezer': 'deezer_artist_id', 'discogs': 'discogs_artist_id'}
         col = col_map[provider]
-        cursor.execute(f"SELECT id, artist_name FROM watchlist_artists WHERE {col} = ? AND id != ?",
-                       (new_provider_id, watchlist_row_id))
-        duplicate = cursor.fetchone()
-        if duplicate:
-            conn.close()
-            return jsonify({"success": False, "error": f"Another watchlist artist ('{duplicate[1]}') already has this {provider} ID"}), 409
 
+        if not is_clear:
+            cursor.execute(f"SELECT id, artist_name FROM watchlist_artists WHERE {col} = ? AND id != ?",
+                           (new_provider_id, watchlist_row_id))
+            duplicate = cursor.fetchone()
+            if duplicate:
+                conn.close()
+                return jsonify({"success": False, "error": f"Another watchlist artist ('{duplicate[1]}') already has this {provider} ID"}), 409
+
+        # Set to new ID or NULL (clear)
+        update_val = new_provider_id if not is_clear else None
         cursor.execute(f"UPDATE watchlist_artists SET {col} = ?, updated_at = CURRENT_TIMESTAMP WHERE id = ?",
-                       (new_provider_id, watchlist_row_id))
+                       (update_val, watchlist_row_id))
 
         conn.commit()
         conn.close()
 
-        print(f"✅ Manually linked watchlist artist '{artist_name}' to {provider} ID: {new_provider_id}")
+        action = 'Cleared' if is_clear else 'Linked'
+        print(f"✅ {action} watchlist artist '{artist_name}' {provider} ID: {new_provider_id or 'NULL'}")
 
         return jsonify({
             "success": True,
diff --git a/webui/static/script.js b/webui/static/script.js
index 56c5d5f5..6722ff24 100644
--- a/webui/static/script.js
+++ b/webui/static/script.js
@@ -39105,197 +39105,165 @@ function _populateLinkedProviderSection(artistId, artistName, spotifyId, itunesI
     const content = document.getElementById('watchlist-linked-provider-content');
     if (!section || !content) return;
 
-    // Determine which providers are linked
-    const hasSpotify = !!spotifyId;
-    const hasItunes = !!itunesId;
-    const hasDeezer = !!deezerId;
-    const hasDiscogs = !!discogsId;
-
-    if (!hasSpotify && !hasItunes && !hasDeezer && !hasDiscogs) {
-        section.style.display = 'none';
-        return;
-    }
-
     section.style.display = '';
 
-    // Build linked artist display — show a card for each linked provider
-    // The artist info from the API is for the currently active provider
-    const linkedName = artistInfo?.name || artistName;
-    const linkedImage = artistInfo?.image_url || '';
-    const nameMatches = linkedName.toLowerCase().trim() === artistName.toLowerCase().trim();
+    const sources = [
+        { key: 'spotify', label: 'Spotify', icon: '🟢', id: spotifyId || '', color: '#1db954' },
+        { key: 'itunes', label: 'Apple Music', icon: '🔴', id: itunesId || '', color: '#fc3c44' },
+        { key: 'deezer', label: 'Deezer', icon: '🟣', id: deezerId || '', color: '#a238ff' },
+        { key: 'discogs', label: 'Discogs', icon: '🟤', id: discogsId || '', color: '#b08968' },
+    ];
 
-    let html = `<div class="watchlist-linked-artist-card">`;
-
-    if (linkedImage) {
-        html += `<img src="${linkedImage}" alt="" class="watchlist-linked-artist-img">`;
-    } else {
-        html += `<div class="watchlist-linked-artist-img-placeholder">🎵</div>`;
+    let html = '<div class="wl-linked-sources">';
+    for (const src of sources) {
+        const matched = !!src.id;
+        const shortId = src.id ? (src.id.length > 16 ? src.id.substring(0, 14) + '...' : src.id) : '';
+        html += `
+            <div class="wl-linked-row ${matched ? 'matched' : 'unmatched'}" data-source="${src.key}">
+                <span class="wl-linked-icon">${src.icon}</span>
+                <span class="wl-linked-label">${src.label}</span>
+                <span class="wl-linked-status">${matched
+                    ? `<span class="wl-linked-id" title="${escapeHtml(src.id)}">${shortId}</span>`
+                    : '<span class="wl-linked-none">Not matched</span>'
+                }</span>
+                <button class="wl-linked-fix-btn" onclick="_openSourceSearch('${src.key}', '${escapeForInlineJs(artistId)}', '${escapeForInlineJs(artistName)}')">${matched ? 'Fix' : 'Match'}</button>
+                ${matched ? `<button class="wl-linked-clear-btn" onclick="_clearSourceMatch('${src.key}', '${escapeForInlineJs(artistId)}', '${escapeForInlineJs(artistName)}')" title="Clear this match">&times;</button>` : ''}
+            </div>`;
     }
+    html += '</div>';
 
-    html += `<div class="watchlist-linked-artist-info">`;
-    html += `<div class="watchlist-linked-artist-name">${escapeHtml(linkedName)}</div>`;
-
-    // Show provider badges
-    html += `<div class="watchlist-linked-artist-providers">`;
-    if (hasSpotify) {
-        html += `<span class="watchlist-provider-badge spotify">Spotify</span>`;
-    }
-    if (hasItunes) {
-        html += `<span class="watchlist-provider-badge itunes">iTunes</span>`;
-    }
-    if (hasDeezer) {
-        html += `<span class="watchlist-provider-badge deezer">Deezer</span>`;
-    }
-    if (hasDiscogs) {
-        html += `<span class="watchlist-provider-badge discogs">Discogs</span>`;
-    }
-    html += `</div>`;
-
-    // Show mismatch warning if linked name differs from watchlist name
-    if (!nameMatches) {
-        html += `<div class="watchlist-linked-mismatch-warning">
-            ⚠️ Name differs from watchlist entry "<strong>${escapeHtml(artistName)}</strong>"
-        </div>`;
-    }
-
-    html += `</div>`; // close info
-
-    html += `<button class="watchlist-linked-change-btn" id="watchlist-linked-change-btn" title="Change linked artist">Change</button>`;
-    html += `</div>`; // close card
-
-    // Search UI (hidden by default)
-    html += `<div class="watchlist-linked-search" id="watchlist-linked-search" style="display:none">
-        <div class="watchlist-linked-search-input-row">
-            <input type="text" id="watchlist-linked-search-input" class="watchlist-linked-search-input"
-                   placeholder="Search for the correct artist..." value="${escapeHtml(artistName)}">
-            <button class="watchlist-linked-search-btn" id="watchlist-linked-search-go">Search</button>
+    // Per-source search panel (hidden, populated on Fix/Match click)
+    html += `<div class="wl-linked-search-panel" id="wl-linked-search-panel" style="display:none">
+        <div class="wl-linked-search-header">
+            <span id="wl-linked-search-title">Search</span>
+            <button class="wl-linked-search-close" onclick="document.getElementById('wl-linked-search-panel').style.display='none'">&times;</button>
         </div>
-        <div class="watchlist-linked-search-results" id="watchlist-linked-search-results"></div>
+        <div class="wl-linked-search-input-row">
+            <input type="text" id="wl-linked-search-input" class="watchlist-linked-search-input"
+                   placeholder="Search..." value="${escapeHtml(artistName)}">
+            <button class="watchlist-linked-search-btn" id="wl-linked-search-go">Search</button>
+        </div>
+        <div class="wl-linked-search-results" id="wl-linked-search-results"></div>
     </div>`;
 
     content.innerHTML = html;
-
-    // Wire up Change button
-    document.getElementById('watchlist-linked-change-btn').onclick = () => {
-        document.getElementById('watchlist-linked-search').style.display = '';
-        const input = document.getElementById('watchlist-linked-search-input');
-        input.focus();
-        input.select();
-    };
-
-    // Wire up search
-    const doSearch = () => _searchLinkedProviderArtists(artistId, artistName);
-    document.getElementById('watchlist-linked-search-go').onclick = doSearch;
-    document.getElementById('watchlist-linked-search-input').onkeydown = (e) => {
-        if (e.key === 'Enter') doSearch();
-    };
 }
 
 /**
- * Search for artists to link to a watchlist entry.
+ * Open per-source search panel for fixing a specific provider match.
  */
-async function _searchLinkedProviderArtists(currentArtistId, watchlistName) {
-    const input = document.getElementById('watchlist-linked-search-input');
-    const resultsContainer = document.getElementById('watchlist-linked-search-results');
-    const query = input?.value?.trim();
-    if (!query || !resultsContainer) return;
+function _openSourceSearch(sourceKey, artistId, artistName) {
+    const panel = document.getElementById('wl-linked-search-panel');
+    if (!panel) return;
+    const labels = { spotify: 'Spotify', itunes: 'Apple Music', deezer: 'Deezer', discogs: 'Discogs' };
+    document.getElementById('wl-linked-search-title').textContent = `Search ${labels[sourceKey] || sourceKey}`;
+    const input = document.getElementById('wl-linked-search-input');
+    input.value = artistName;
+    document.getElementById('wl-linked-search-results').innerHTML = '';
+    panel.style.display = '';
+    panel.dataset.source = sourceKey;
+    panel.dataset.artistId = artistId;
+    panel.dataset.artistName = artistName;
+    input.focus();
+    input.select();
 
-    resultsContainer.innerHTML = '<div style="padding:12px;color:#888;text-align:center">Searching...</div>';
+    const doSearch = () => _searchSourceArtists(sourceKey, artistId);
+    document.getElementById('wl-linked-search-go').onclick = doSearch;
+    input.onkeydown = (e) => { if (e.key === 'Enter') doSearch(); };
+}
+
+async function _searchSourceArtists(sourceKey, watchlistArtistId) {
+    const input = document.getElementById('wl-linked-search-input');
+    const container = document.getElementById('wl-linked-search-results');
+    const query = input?.value?.trim();
+    if (!query || !container) return;
+
+    container.innerHTML = '<div style="padding:12px;color:#888;text-align:center">Searching...</div>';
 
     try {
-        // Use match/search to find artists (returns genres, popularity, image)
-        const response = await fetch('/api/match/search', {
+        const response = await fetch('/api/library/search-service', {
             method: 'POST',
             headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify({ query: query, context: 'artist' })
+            body: JSON.stringify({ service: sourceKey, entity_type: 'artist', query })
         });
         const data = await response.json();
+        if (!data.success) throw new Error(data.error);
 
         const results = data.results || [];
-        if (results.length === 0) {
-            resultsContainer.innerHTML = '<div style="padding:12px;color:#888;text-align:center">No artists found</div>';
+        if (!results.length) {
+            container.innerHTML = '<div style="padding:12px;color:#888;text-align:center">No artists found</div>';
             return;
         }
 
         let html = '';
-        for (const r of results.slice(0, 8)) {
-            const a = r.artist || r;
-            const img = a.image_url || '';
-            const genres = (a.genres || []).slice(0, 2).join(', ');
-            const pop = a.popularity || 0;
-            const followers = a.followers || 0;
-            const popMeta = pop > 0 ? `Pop: ${pop}` : followers > 0 ? `${followers.toLocaleString()} fans` : '';
-            html += `<div class="watchlist-linked-search-result" data-id="${a.id}" data-name="${escapeHtml(a.name)}">
-                ${img ? `<img src="${img}" alt="" class="watchlist-linked-result-img">` :
+        for (const r of results) {
+            html += `<div class="watchlist-linked-search-result" data-id="${escapeHtml(r.id)}" data-name="${escapeHtml(r.name)}">
+                ${r.image ? `<img src="${r.image}" alt="" class="watchlist-linked-result-img">` :
                     `<div class="watchlist-linked-result-img-placeholder">🎵</div>`}
                 <div class="watchlist-linked-result-info">
-                    <div class="watchlist-linked-result-name">${escapeHtml(a.name)}</div>
-                    <div class="watchlist-linked-result-meta">${genres ? escapeHtml(genres) : ''}${genres && popMeta ? ' · ' : ''}${popMeta}</div>
+                    <div class="watchlist-linked-result-name">${escapeHtml(r.name)}</div>
+                    <div class="watchlist-linked-result-meta">${escapeHtml(r.extra || '')}</div>
                 </div>
                 <button class="watchlist-linked-select-btn">Select</button>
             </div>`;
         }
+        container.innerHTML = html;
 
-        resultsContainer.innerHTML = html;
-
-        // Wire up select buttons
-        resultsContainer.querySelectorAll('.watchlist-linked-search-result').forEach(el => {
+        container.querySelectorAll('.watchlist-linked-search-result').forEach(el => {
             el.querySelector('.watchlist-linked-select-btn').onclick = async (e) => {
                 e.stopPropagation();
-                const newId = el.dataset.id;
-                const newName = el.dataset.name;
-                await _linkProviderArtist(currentArtistId, newId, newName);
+                await _linkSourceArtist(sourceKey, watchlistArtistId, el.dataset.id, el.dataset.name);
             };
         });
-
     } catch (err) {
-        console.error('Error searching for linked artist:', err);
-        resultsContainer.innerHTML = '<div style="padding:12px;color:#f44;text-align:center">Search error</div>';
+        console.error(`Error searching ${sourceKey}:`, err);
+        container.innerHTML = '<div style="padding:12px;color:#f44;text-align:center">Search error</div>';
     }
 }
 
-/**
- * Link a watchlist artist to a new provider artist.
- */
-async function _linkProviderArtist(currentArtistId, newProviderId, newProviderName) {
-    // Determine provider from active metadata source
-    // Spotify IDs are alphanumeric (e.g. "4Z8W4fKeB5YxbusRsdQVPb"), iTunes/Deezer are numeric
-    let provider;
-    if (/^\d+$/.test(newProviderId)) {
-        // Numeric ID — check configured fallback source to distinguish iTunes from Deezer
-        const fallbackSrc = document.getElementById('metadata-fallback-source')?.value || 'itunes';
-        provider = fallbackSrc === 'deezer' ? 'deezer' : 'itunes';
-    } else {
-        provider = 'spotify';
-    }
-
+async function _linkSourceArtist(sourceKey, watchlistArtistId, newId, newName) {
     try {
-        const response = await fetch(`/api/watchlist/artist/${currentArtistId}/link-provider`, {
+        const response = await fetch(`/api/watchlist/artist/${watchlistArtistId}/link-provider`, {
             method: 'POST',
             headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify({ provider_id: newProviderId, provider: provider })
+            body: JSON.stringify({ provider_id: newId, provider: sourceKey })
         });
-
         const data = await response.json();
         if (!data.success) {
-            showToast(`Failed to link artist: ${data.error}`, 'error');
+            showToast(`Failed to link: ${data.error}`, 'error');
             return;
         }
-
-        showToast(`Linked to "${newProviderName}" on ${provider}`, 'success');
-
-        // Close and reopen the config modal with the new ID to refresh everything
+        showToast(`Linked to "${newName}" on ${sourceKey}`, 'success');
+        // Refresh the modal
+        const panel = document.getElementById('wl-linked-search-panel');
+        const artistName = panel?.dataset?.artistName || newName;
         closeWatchlistArtistConfigModal();
-        setTimeout(() => {
-            openWatchlistArtistConfigModal(newProviderId, newProviderName);
-        }, 300);
-
+        setTimeout(() => openWatchlistArtistConfigModal(watchlistArtistId, artistName), 300);
     } catch (err) {
-        console.error('Error linking provider artist:', err);
         showToast('Failed to link artist', 'error');
     }
 }
 
+async function _clearSourceMatch(sourceKey, watchlistArtistId, artistName) {
+    try {
+        const response = await fetch(`/api/watchlist/artist/${watchlistArtistId}/link-provider`, {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({ provider_id: '', provider: sourceKey })
+        });
+        const data = await response.json();
+        if (!data.success) {
+            showToast(`Failed to clear: ${data.error}`, 'error');
+            return;
+        }
+        showToast(`Cleared ${sourceKey} match`, 'success');
+        closeWatchlistArtistConfigModal();
+        setTimeout(() => openWatchlistArtistConfigModal(watchlistArtistId, artistName), 300);
+    } catch (err) {
+        showToast('Failed to clear match', 'error');
+    }
+}
+
 /**
  * Open watchlist artist configuration modal
  * @param {string} artistId - Spotify artist ID
diff --git a/webui/static/style.css b/webui/static/style.css
index bda61fca..30beacb4 100644
--- a/webui/static/style.css
+++ b/webui/static/style.css
@@ -17015,120 +17015,98 @@ body.helper-mode-active #dashboard-activity-feed:hover {
 }
 
 /* Linked Provider Artist */
-.watchlist-linked-artist-card {
+/* Per-source linked rows */
+.wl-linked-sources {
+    display: flex;
+    flex-direction: column;
+    gap: 4px;
+}
+
+.wl-linked-row {
     display: flex;
     align-items: center;
-    gap: 12px;
-    padding: 12px 14px;
-    background: rgba(255, 255, 255, 0.04);
-    border: 1px solid rgba(255, 255, 255, 0.1);
-    border-radius: 12px;
+    gap: 8px;
+    padding: 8px 10px;
+    border-radius: 8px;
+    background: rgba(255, 255, 255, 0.03);
+    border: 1px solid rgba(255, 255, 255, 0.06);
 }
 
-.watchlist-linked-artist-img {
-    width: 48px;
-    height: 48px;
-    border-radius: 50%;
-    object-fit: cover;
-    flex-shrink: 0;
+.wl-linked-row.matched {
+    border-color: rgba(76, 175, 80, 0.15);
 }
 
-.watchlist-linked-artist-img-placeholder {
-    width: 48px;
-    height: 48px;
-    border-radius: 50%;
-    background: rgba(255, 255, 255, 0.08);
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    font-size: 20px;
-    flex-shrink: 0;
+.wl-linked-row.unmatched {
+    border-color: rgba(255, 255, 255, 0.04);
+    opacity: 0.7;
 }
 
-.watchlist-linked-artist-info {
-    flex: 1;
-    min-width: 0;
-}
+.wl-linked-icon { font-size: 14px; flex-shrink: 0; width: 20px; text-align: center; }
+.wl-linked-label { font-size: 12px; font-weight: 600; color: rgba(255,255,255,0.8); width: 90px; flex-shrink: 0; }
+.wl-linked-status { flex: 1; min-width: 0; font-size: 11px; }
+.wl-linked-id { color: rgba(255,255,255,0.5); font-family: monospace; font-size: 11px; }
+.wl-linked-none { color: rgba(255,255,255,0.25); font-style: italic; }
 
-.watchlist-linked-artist-name {
-    font-size: 14px;
-    font-weight: 600;
-    color: #fff;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-}
-
-.watchlist-linked-artist-providers {
-    display: flex;
-    gap: 6px;
-    margin-top: 4px;
-}
-
-.watchlist-provider-badge {
-    padding: 2px 8px;
+.wl-linked-fix-btn {
+    padding: 3px 10px;
     border-radius: 6px;
     font-size: 11px;
     font-weight: 600;
-    text-transform: uppercase;
-    letter-spacing: 0.5px;
-}
-
-.watchlist-provider-badge.spotify {
-    background: rgba(30, 215, 96, 0.15);
-    color: #1ed760;
-    border: 1px solid rgba(30, 215, 96, 0.3);
-}
-
-.watchlist-provider-badge.itunes {
-    background: rgba(252, 60, 68, 0.15);
-    color: #fc3c44;
-    border: 1px solid rgba(252, 60, 68, 0.3);
-}
-
-.watchlist-provider-badge.deezer {
-    background: rgba(162, 56, 255, 0.15);
-    color: #a238ff;
-    border: 1px solid rgba(162, 56, 255, 0.3);
-}
-
-.watchlist-provider-badge.discogs {
-    background: rgba(212, 165, 116, 0.15);
-    color: #D4A574;
-    border: 1px solid rgba(212, 165, 116, 0.3);
-}
-
-.watchlist-linked-mismatch-warning {
-    margin-top: 6px;
-    font-size: 12px;
-    color: #ffc107;
-    line-height: 1.3;
-}
-
-.watchlist-linked-mismatch-warning strong {
-    color: #fff;
-}
-
-.watchlist-linked-change-btn {
-    padding: 6px 14px;
-    border-radius: 8px;
-    font-size: 12px;
-    font-weight: 600;
-    color: #ccc;
-    background: rgba(255, 255, 255, 0.08);
-    border: 1px solid rgba(255, 255, 255, 0.15);
+    color: rgba(255,255,255,0.7);
+    background: rgba(255,255,255,0.06);
+    border: 1px solid rgba(255,255,255,0.1);
     cursor: pointer;
-    transition: all 0.2s ease;
     flex-shrink: 0;
 }
 
-.watchlist-linked-change-btn:hover {
+.wl-linked-fix-btn:hover {
     background: rgba(var(--accent-rgb), 0.15);
     color: #fff;
     border-color: rgba(var(--accent-rgb), 0.3);
 }
 
-/* Linked Provider Search */
+.wl-linked-clear-btn {
+    background: none;
+    border: none;
+    color: rgba(255,255,255,0.2);
+    cursor: pointer;
+    font-size: 14px;
+    padding: 2px 4px;
+    flex-shrink: 0;
+}
+
+.wl-linked-clear-btn:hover { color: #ef4444; }
+
+/* Per-source search panel */
+.wl-linked-search-panel {
+    margin-top: 8px;
+    padding: 10px;
+    background: rgba(255,255,255,0.03);
+    border: 1px solid rgba(255,255,255,0.08);
+    border-radius: 10px;
+}
+
+.wl-linked-search-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 8px;
+    font-size: 12px;
+    font-weight: 600;
+    color: rgba(255,255,255,0.7);
+}
+
+.wl-linked-search-close {
+    background: none;
+    border: none;
+    color: rgba(255,255,255,0.3);
+    cursor: pointer;
+    font-size: 16px;
+}
+
+.wl-linked-search-close:hover { color: #fff; }
+
+/* Keep existing search styles */
 .watchlist-linked-search {
     margin-top: 12px;
 }