diff --git a/src/renderer-archive.ts b/src/renderer-archive.ts
index e47c1a9..54d5518 100644
--- a/src/renderer-archive.ts
+++ b/src/renderer-archive.ts
@@ -119,10 +119,10 @@ function renderArchiveSearchResults(result: ArchiveSearchResult): void {
         const typeBadge = `<span class="archive-type-badge ${hit.type === 'live' ? 'live' : 'vod'}">${hit.type === 'live' ? 'LIVE' : 'VOD'}</span>`;
         const safeFullAttr = hit.fullPath.replace(/\\/g, '\\\\').replace(/'/g, "\\'");
         const chatBtn = hit.chatPath
-            ? `<button class="queue-detail-btn" onclick="openEventsOrChat('${safeFullAttr.replace(/\.(mp4|mkv|ts|m4v)$/i, '.chat.jsonl')}', '${escapeArchiveHtml(hit.fileName)}', 'chat')">${escapeArchiveHtml(UI_TEXT.static.archiveViewChat || 'Chat')}</button>`
+            ? `<button type="button" class="queue-detail-btn" onclick="openEventsOrChat('${safeFullAttr.replace(/\.(mp4|mkv|ts|m4v)$/i, '.chat.jsonl')}', '${escapeArchiveHtml(hit.fileName)}', 'chat')">${escapeArchiveHtml(UI_TEXT.static.archiveViewChat || 'Chat')}</button>`
             : '';
         const eventsBtn = hit.eventsPath
-            ? `<button class="queue-detail-btn" onclick="openEventsOrChat('${(hit.eventsPath || '').replace(/\\/g, '\\\\').replace(/'/g, "\\'")}', '${escapeArchiveHtml(hit.fileName)}', 'events')">${escapeArchiveHtml(UI_TEXT.static.archiveViewEvents || 'Events')}</button>`
+            ? `<button type="button" class="queue-detail-btn" onclick="openEventsOrChat('${(hit.eventsPath || '').replace(/\\/g, '\\\\').replace(/'/g, "\\'")}', '${escapeArchiveHtml(hit.fileName)}', 'events')">${escapeArchiveHtml(UI_TEXT.static.archiveViewEvents || 'Events')}</button>`
             : '';
         return `
             <div class="archive-result-row">
@@ -136,8 +136,8 @@ function renderArchiveSearchResults(result: ArchiveSearchResult): void {
                     <div class="archive-result-size">${escapeArchiveHtml(formatBytesForArchive(hit.size))}</div>
                 </div>
                 <div class="archive-result-actions">
-                    <button class="queue-detail-btn" onclick="openFilePath('${safeFullAttr}')">${escapeArchiveHtml(UI_TEXT.static.archiveOpen || 'Oeffnen')}</button>
-                    <button class="queue-detail-btn" onclick="showFileInFolder('${safeFullAttr}')">${escapeArchiveHtml(UI_TEXT.static.archiveShowInFolder || 'Ordner')}</button>
+                    <button type="button" class="queue-detail-btn" onclick="openFilePath('${safeFullAttr}')">${escapeArchiveHtml(UI_TEXT.static.archiveOpen || 'Oeffnen')}</button>
+                    <button type="button" class="queue-detail-btn" onclick="showFileInFolder('${safeFullAttr}')">${escapeArchiveHtml(UI_TEXT.static.archiveShowInFolder || 'Ordner')}</button>
                     ${chatBtn}
                     ${eventsBtn}
                 </div>
diff --git a/src/renderer-profile.ts b/src/renderer-profile.ts
index 8faaf75..92152e1 100644
--- a/src/renderer-profile.ts
+++ b/src/renderer-profile.ts
@@ -132,7 +132,7 @@ function renderStreamerProfileCard(p: StreamerProfile): void {
                     </div>
                     ${p.currentTitle ? `<div class="streamer-profile-live-title">${escapeProfileHtml(p.currentTitle)}</div>` : ''}
                     ${p.currentGame ? `<div class="streamer-profile-live-game">${escapeProfileHtml(p.currentGame)}</div>` : ''}
-                    <button class="streamer-profile-btn primary streamer-profile-live-rec-btn" onclick="event.stopPropagation(); triggerLiveRecordingFromProfile('${safeLogin}')">${escapeProfileHtml(UI_TEXT.profile.recordNow)}</button>
+                    <button type="button" class="streamer-profile-btn primary streamer-profile-live-rec-btn" onclick="event.stopPropagation(); triggerLiveRecordingFromProfile('${safeLogin}')">${escapeProfileHtml(UI_TEXT.profile.recordNow)}</button>
                 </div>
             </div>
         ` : '';
@@ -157,8 +157,8 @@ function renderStreamerProfileCard(p: StreamerProfile): void {
                 </div>
             </div>
             <div class="streamer-profile-actions">
-                <button class="streamer-profile-btn primary" onclick="openTwitchChannel('${safeUrl}')">${escapeProfileHtml(UI_TEXT.profile.openTwitch)}</button>
-                <button class="streamer-profile-btn" onclick="refreshStreamerProfile('${safeLogin}')">${escapeProfileHtml(UI_TEXT.profile.refresh)}</button>
+                <button type="button" class="streamer-profile-btn primary" onclick="openTwitchChannel('${safeUrl}')">${escapeProfileHtml(UI_TEXT.profile.openTwitch)}</button>
+                <button type="button" class="streamer-profile-btn" onclick="refreshStreamerProfile('${safeLogin}')">${escapeProfileHtml(UI_TEXT.profile.refresh)}</button>
             </div>
         </div>
         ${liveCard}
diff --git a/src/renderer-queue.ts b/src/renderer-queue.ts
index 0b4fb05..6194f4d 100644
--- a/src/renderer-queue.ts
+++ b/src/renderer-queue.ts
@@ -21,23 +21,23 @@ function renderQueueItemFileActions(item: QueueItem): string {
     // full VOD download). For multi-part downloads "open the first part" is
     // surprising — the user almost always wants the folder.
     if (item.outputFiles.length === 1) {
-        buttons.push(`<button class="queue-detail-btn" onclick="invokeOpenFile('${safeFirstAttr}')">${escapeHtml(UI_TEXT.queue.openFile)}</button>`);
+        buttons.push(`<button type="button" class="queue-detail-btn" onclick="invokeOpenFile('${safeFirstAttr}')">${escapeHtml(UI_TEXT.queue.openFile)}</button>`);
     }
-    buttons.push(`<button class="queue-detail-btn" onclick="invokeShowInFolder('${safeFirstAttr}')">${escapeHtml(UI_TEXT.queue.showInFolder)}</button>`);
+    buttons.push(`<button type="button" class="queue-detail-btn" onclick="invokeShowInFolder('${safeFirstAttr}')">${escapeHtml(UI_TEXT.queue.showInFolder)}</button>`);
 
     // Surface a "View chat" button when a sibling chat file exists in the
     // outputs list. Single click opens the in-app viewer modal.
     const chatFile = item.outputFiles.find((f) => /\.chat\.json(l)?$/i.test(f));
     if (chatFile) {
         const safeChatAttr = chatFile.replace(/'/g, "\\'").replace(/"/g, '&quot;');
-        buttons.push(`<button class="queue-detail-btn" onclick="openChatViewer('${safeChatAttr}', '${escapeHtml(item.title || item.streamer || '').replace(/'/g, "\\'")}')">${escapeHtml(UI_TEXT.queue.viewChat)}</button>`);
+        buttons.push(`<button type="button" class="queue-detail-btn" onclick="openChatViewer('${safeChatAttr}', '${escapeHtml(item.title || item.streamer || '').replace(/'/g, "\\'")}')">${escapeHtml(UI_TEXT.queue.viewChat)}</button>`);
     }
 
     // Same pattern for the .events.jsonl sidecar — title/game change timeline.
     const eventsFile = item.outputFiles.find((f) => /\.events\.jsonl$/i.test(f));
     if (eventsFile) {
         const safeEventsAttr = eventsFile.replace(/'/g, "\\'").replace(/"/g, '&quot;');
-        buttons.push(`<button class="queue-detail-btn" onclick="openEventsViewer('${safeEventsAttr}', '${escapeHtml(item.title || item.streamer || '').replace(/'/g, "\\'")}')">${escapeHtml(UI_TEXT.queue.viewEvents)}</button>`);
+        buttons.push(`<button type="button" class="queue-detail-btn" onclick="openEventsViewer('${safeEventsAttr}', '${escapeHtml(item.title || item.streamer || '').replace(/'/g, "\\'")}')">${escapeHtml(UI_TEXT.queue.viewEvents)}</button>`);
     }
 
     const fileLabel = item.outputFiles.length === 1
diff --git a/src/renderer-streamers.ts b/src/renderer-streamers.ts
index 5c6b83f..f7ec521 100644
--- a/src/renderer-streamers.ts
+++ b/src/renderer-streamers.ts
@@ -266,8 +266,8 @@ function buildVodCardHtml(vod: VOD, streamer: string, downloadedIds?: Set<string
                 </div>
             </div>
             <div class="vod-actions">
-                <button class="vod-btn secondary" data-vod-action="trim">${escapeHtml(UI_TEXT.vods.trimButton)}</button>
-                <button class="vod-btn primary" data-vod-action="queue">${escapeHtml(UI_TEXT.vods.addQueue)}</button>
+                <button type="button" class="vod-btn secondary" data-vod-action="trim">${escapeHtml(UI_TEXT.vods.trimButton)}</button>
+                <button type="button" class="vod-btn primary" data-vod-action="queue">${escapeHtml(UI_TEXT.vods.addQueue)}</button>
             </div>
         </div>
     `;
diff --git a/src/renderer.ts b/src/renderer.ts
index f68bdd7..1a96755 100644
--- a/src/renderer.ts
+++ b/src/renderer.ts
@@ -1639,9 +1639,9 @@ function renderMergeFiles(): void {
                 <div class="file-order">${index + 1}</div>
                 <div class="file-name" title="${file}">${name}</div>
                 <div class="file-actions">
-                    <button class="file-btn" onclick="moveMergeFile(${index}, -1)" ${index === 0 ? 'disabled' : ''}>&#9650;</button>
-                    <button class="file-btn" onclick="moveMergeFile(${index}, 1)" ${index === mergeFiles.length - 1 ? 'disabled' : ''}>&#9660;</button>
-                    <button class="file-btn remove" onclick="removeMergeFile(${index})">x</button>
+                    <button type="button" class="file-btn" onclick="moveMergeFile(${index}, -1)" ${index === 0 ? 'disabled' : ''}>&#9650;</button>
+                    <button type="button" class="file-btn" onclick="moveMergeFile(${index}, 1)" ${index === mergeFiles.length - 1 ? 'disabled' : ''}>&#9660;</button>
+                    <button type="button" class="file-btn remove" onclick="removeMergeFile(${index})">x</button>
                 </div>
             </div>
         `;