diff --git a/ext/action-popup.html b/ext/action-popup.html
index d153f6eb29..bf1fe1661c 100644
--- a/ext/action-popup.html
+++ b/ext/action-popup.html
@@ -25,7 +25,7 @@
         </div>
     </label>
     <div class="nav-button-container">
-        <button class="nav-button action-select-profile" title="Change primary profile" hidden>
+        <button type="button" class="nav-button action-select-profile" title="Change primary profile" hidden>
             <span class="icon" data-icon="profile"></span>
             <span class="profile-select-container"><select class="profile-select" id="profile-select">
                 <optgroup label="Primary Profile" id="profile-select-option-group"></optgroup>
diff --git a/ext/display-templates.html b/ext/display-templates.html
index 979415c761..ed0037bb6d 100644
--- a/ext/display-templates.html
+++ b/ext/display-templates.html
@@ -5,27 +5,27 @@
     <div class="entry-current-indicator" title="Current entry"><span class="entry-current-indicator-inner"></span></div>
     <div class="entry-header">
         <div class="actions">
-            <button class="action-button action-button-collapsible" data-action="view-tags" hidden disabled>
+            <button type="button" class="action-button action-button-collapsible" data-action="view-tags" hidden disabled>
                 <span class="action-icon icon" data-icon="tag"></span>
             </button>
-            <button class="action-button" data-action="view-note" hidden disabled title="View added note" data-hotkey='["viewNote","title","View added note ({0})"]' data-menu-position="left below h-cover v-cover">
+            <button type="button" class="action-button" data-action="view-note" hidden disabled title="View added note" data-hotkey='["viewNote","title","View added note ({0})"]' data-menu-position="left below h-cover v-cover">
                 <span class="action-icon icon color-icon" data-icon="view-note"></span>
                 <span class="action-button-badge icon" hidden></span>
             </button>
-            <button class="action-button" data-action="add-note" hidden disabled data-mode="term-kanji" title="Add expression" data-hotkey='["addNoteTermKanji","title","Add expression ({0})"]'>
+            <button type="button" class="action-button" data-action="add-note" hidden disabled data-mode="term-kanji" title="Add expression" data-hotkey='["addNoteTermKanji","title","Add expression ({0})"]'>
                 <span class="action-icon icon color-icon" data-icon="add-term-kanji"></span>
             </button>
-            <button class="action-button" data-action="add-note" hidden disabled data-mode="term-kana" title="Add reading" data-hotkey='["addNoteTermKana","title","Add reading ({0})"]'>
+            <button type="button" class="action-button" data-action="add-note" hidden disabled data-mode="term-kana" title="Add reading" data-hotkey='["addNoteTermKana","title","Add reading ({0})"]'>
                 <span class="action-icon icon color-icon" data-icon="add-term-kana"></span>
             </button>
-            <button class="action-button" data-action="play-audio" title="Play audio" data-title-default="Play audio" data-hotkey='["playAudio",["title","data-title-default"],"Play audio ({0})"]' data-menu-position="left below h-cover v-cover">
+            <button type="button" class="action-button" data-action="play-audio" title="Play audio" data-title-default="Play audio" data-hotkey='["playAudio",["title","data-title-default"],"Play audio ({0})"]' data-menu-position="left below h-cover v-cover">
                 <span class="action-icon icon color-icon" data-icon="play-audio"></span>
                 <span class="action-button-badge icon" hidden></span>
             </button>
             <span class="entry-current-indicator-icon" title="Current entry">
                 <span class="icon color-icon" data-icon="entry-current"></span>
             </span>
-            <button class="action-button action-button-collapsible" data-action="menu" data-menu-position="left below h-cover v-cover">
+            <button type="button" class="action-button action-button-collapsible" data-action="menu" data-menu-position="left below h-cover v-cover">
                 <span class="action-icon icon" data-icon="kebab-menu"></span>
             </button>
         </div>
@@ -58,7 +58,7 @@
         </span>
     </div>
     <div class="headword-details">
-        <button class="action-button" data-action="play-audio" title="Play audio" data-title-default="Play audio" data-hotkey='["playAudio",["title","data-title-default"],"Play audio ({0})"]' data-menu-position="right below h-cover v-cover">
+        <button type="button" class="action-button" data-action="play-audio" title="Play audio" data-title-default="Play audio" data-hotkey='["playAudio",["title","data-title-default"],"Play audio ({0})"]' data-menu-position="right below h-cover v-cover">
             <span class="action-icon icon color-icon" data-icon="play-audio"></span>
             <span class="action-button-badge icon" hidden></span>
         </button>
@@ -66,7 +66,7 @@
 </div></template>
 <template id="definition-item-template" data-remove-whitespace-text="true"><li class="definition-item">
     <div class="definition-item-inner">
-        <button class="definition-item-expansion-button"><div class="definition-item-expansion-button-icon icon" data-icon="double-down-chevron"></div></button>
+        <button type="button" class="definition-item-expansion-button"><div class="definition-item-expansion-button-icon icon" data-icon="double-down-chevron"></div></button>
         <div class="definition-item-content">
             <div class="definition-tag-list tag-list"></div>
             <div class="definition-disambiguation-list"></div>
@@ -110,16 +110,16 @@
     <div class="entry-current-indicator" title="Current entry"><span class="entry-current-indicator-inner"></span></div>
     <div class="entry-header">
         <div class="actions">
-            <button class="action-button" data-action="view-note" hidden disabled title="View added note" data-hotkey='["viewNote","title","View added note ({0})"]'>
+            <button type="button" class="action-button" data-action="view-note" hidden disabled title="View added note" data-hotkey='["viewNote","title","View added note ({0})"]'>
                 <span class="action-icon icon color-icon" data-icon="view-note"></span>
             </button>
-            <button class="action-button" data-action="add-note" hidden disabled data-mode="kanji" title="Add kanji" data-hotkey='["addNoteKanji","title","Add kanji ({0})"]'>
+            <button type="button" class="action-button" data-action="add-note" hidden disabled data-mode="kanji" title="Add kanji" data-hotkey='["addNoteKanji","title","Add kanji ({0})"]'>
                 <span class="action-icon icon color-icon" data-icon="add-term-kanji"></span>
             </button>
             <span class="entry-current-indicator-icon" title="Current entry">
                 <span class="icon color-icon" data-icon="entry-current"></span>
             </span>
-            <button class="action-button action-button-collapsible" data-action="menu" data-menu-position="left below h-cover v-cover">
+            <button type="button" class="action-button action-button-collapsible" data-action="menu" data-menu-position="left below h-cover v-cover">
                 <span class="action-icon icon" data-icon="kebab-menu"></span>
             </button>
         </div>
@@ -136,25 +136,25 @@
     </div>
     <table class="kanji-glyph-data"><tbody>
         <tr>
-            <th>Meaning</th>
-            <th>Readings</th>
-            <th>Statistics</th>
+            <th scope="col">Meaning</th>
+            <th scope="col">Readings</th>
+            <th scope="col">Statistics</th>
         </tr>
         <tr>
             <td class="kanji-gloss-container"><ol class="kanji-gloss-list"></ol></td>
             <td class="kanji-readings"><dl class="kanji-readings-chinese"></dl><dl class="kanji-readings-japanese"></dl></td>
             <td class="kanji-statistics"></td>
         </tr>
-        <tr><th colspan="3">Classifications</th></tr>
+        <tr><th scope="col" colspan="3">Classifications</th></tr>
         <tr><td colspan="3" class="kanji-classifications"></td></tr>
-        <tr><th colspan="3">Codepoints</th></tr>
+        <tr><th scope="col" colspan="3">Codepoints</th></tr>
         <tr><td colspan="3" class="kanji-codepoints"></td></tr>
-        <tr><th colspan="3">Dictionary Indices</th></tr>
+        <tr><th scope="col" colspan="3">Dictionary Indices</th></tr>
         <tr><td colspan="3" class="kanji-dictionary-indices"></td></tr>
     </tbody></table>
 </div></template>
 <template id="kanji-info-table-template"><table class="kanji-info-table"><tbody class="kanji-info-table-body"></tbody></table></template>
-<template id="kanji-info-table-item-template"><tr class="kanji-info-table-item"><th class="kanji-info-table-item-header"></th><td class="kanji-info-table-item-value"></td></tr></template>
+<template id="kanji-info-table-item-template"><tr class="kanji-info-table-item"><th scope="col" class="kanji-info-table-item-header"></th><td class="kanji-info-table-item-value"></td></tr></template>
 <template id="kanji-info-table-empty-template"><tr class="kanji-info-table-item kanji-info-table-item-empty"><td class="kanji-info-table-item-value-empty">No data found</td></tr></template>
 <template id="kanji-gloss-item-template"><li class="kanji-gloss-item"><span class="kanji-gloss-content"></span></li></template>
 <!-- [html-validate-disable element-required-ancestor] -->
@@ -169,7 +169,7 @@
 <template id="footer-notification-template"><div class="footer-notification scrollbar-inverse">
     <div class="footer-notification-body"></div>
     <div class="footer-notification-close-button-container">
-        <button class="footer-notification-close-button"><span class="footer-notification-close-button-icon icon" data-icon="cross"></span></button>
+        <button type="button" class="footer-notification-close-button"><span class="footer-notification-close-button-icon icon" data-icon="cross"></span></button>
     </div>
 </div></template>
 <template id="footer-notification-tag-details-template" data-remove-whitespace-text="true">
@@ -193,12 +193,12 @@
 <!-- Popup menu -->
 <template id="audio-button-popup-menu-template"><div class="popup-menu-container scan-disable audio-button-popup-menu" tabindex="-1" role="dialog"><div class="popup-menu popup-menu-auto-size"><div class="popup-menu-body"></div></div></div></template>
 <template id="audio-button-popup-menu-item-template"><div class="popup-menu-item-group">
-    <button class="popup-menu-item popup-menu-item-audio-button" data-menu-action="playAudioFromSource"><div class="popup-menu-item-icon icon" data-icon="none"></div><span class="popup-menu-item-label"></span></button>
-    <button class="popup-menu-item popup-menu-item-set-primary-audio-button" data-menu-action="setPrimaryAudio" title="Use as audio for Anki card"><div class="popup-menu-item-icon icon" data-icon="note-card"></div></button>
+    <button type="button" class="popup-menu-item popup-menu-item-audio-button" data-menu-action="playAudioFromSource"><div class="popup-menu-item-icon icon" data-icon="none"></div><span class="popup-menu-item-label"></span></button>
+    <button type="button" class="popup-menu-item popup-menu-item-set-primary-audio-button" data-menu-action="setPrimaryAudio" title="Use as audio for Anki card"><div class="popup-menu-item-icon icon" data-icon="note-card"></div></button>
 </div></template>
 <template id="view-note-button-popup-menu-template"><div class="popup-menu-container scan-disable view-note-button-popup-menu" tabindex="-1" role="dialog"><div class="popup-menu popup-menu-auto-size"><div class="popup-menu-body"></div></div></div></template>
-<template id="view-note-button-popup-menu-item-template"><button class="popup-menu-item"><span class="popup-menu-item-label"></span></button></template>
+<template id="view-note-button-popup-menu-item-template"><button type="button" class="popup-menu-item"><span class="popup-menu-item-label"></span></button></template>
 <template id="dictionary-entry-popup-menu-template"><div class="popup-menu-container scan-disable dictionary-entry-popup-menu" tabindex="-1" role="dialog"><div class="popup-menu popup-menu-auto-size"><div class="popup-menu-body"></div></div></div></template>
-<template id="dictionary-entry-popup-menu-item-template"><button class="popup-menu-item"><span class="popup-menu-item-label"></span></button></template>
+<template id="dictionary-entry-popup-menu-item-template"><button type="button" class="popup-menu-item"><span class="popup-menu-item-label"></span></button></template>
 
 </body></html>
diff --git a/ext/permissions.html b/ext/permissions.html
index bd97e94d37..4aaef3c1f9 100644
--- a/ext/permissions.html
+++ b/ext/permissions.html
@@ -194,7 +194,7 @@ <h2 id="permissions"></h2>
                 <div class="settings-item-label">Configure allowed origins&hellip;</div>
             </div>
             <div class="settings-item-right open-panel-button-container">
-                <button class="icon-button"><span class="icon-button-inner"><span class="icon" data-icon="material-right-arrow"></span></span></button>
+                <button type="button" class="icon-button"><span class="icon-button-inner"><span class="icon" data-icon="material-right-arrow"></span></span></button>
             </div>
         </div></div>
     </div>
@@ -216,8 +216,8 @@ <h2 id="permissions"></h2>
         <div class="modal-title">Allowed Origins</div>
         <div class="modal-header-button-container">
             <div class="modal-header-button-group">
-                <button class="icon-button modal-header-button" data-modal-action="expand"><span class="icon-button-inner"><span class="icon" data-icon="expand"></span></span></button>
-                <button class="icon-button modal-header-button" data-modal-action="collapse"><span class="icon-button-inner"><span class="icon" data-icon="collapse"></span></span></button>
+                <button type="button" class="icon-button modal-header-button" data-modal-action="expand"><span class="icon-button-inner"><span class="icon" data-icon="expand"></span></span></button>
+                <button type="button" class="icon-button modal-header-button" data-modal-action="collapse"><span class="icon-button-inner"><span class="icon" data-icon="collapse"></span></span></button>
             </div>
         </div>
     </div>
@@ -240,7 +240,7 @@ <h2 id="permissions"></h2>
                 <div id="permissions-origin-list" class="generic-list">
                     <div class="permissions-origin-index generic-list-index-prefix"></div>
                     <input type="text" class="permissions-origin-input horizontal-flex-fill" autocomplete="off" spellcheck="false" id="permissions-origin-new-input">
-                    <button class="low-emphasis permissions-origin-button" id="permissions-origin-add">Add</button>
+                    <button type="button" class="low-emphasis permissions-origin-button" id="permissions-origin-add">Add</button>
                 </div>
                 <div id="permissions-origin-list-empty" class="margin-above">
                     No additional origins specified.
@@ -250,18 +250,18 @@ <h2 id="permissions"></h2>
         </div>
     </div>
     <div class="modal-footer">
-        <button class="low-emphasis" data-modal-action="hide">Close</button>
+        <button type="button" class="low-emphasis" data-modal-action="hide">Close</button>
     </div>
 </div></div>
 
 <template id="permissions-origin-template">
     <div class="permissions-origin-index generic-list-index-prefix"></div>
     <input type="text" class="permissions-origin-input horizontal-flex-fill" autocomplete="off" spellcheck="false" readonly>
-    <button class="icon-button permissions-origin-menu-button permissions-origin-button" data-menu="permissions-origin-menu" data-menu-position="below left"><span class="icon-button-inner"><span class="icon" data-icon="kebab-menu"></span></span></button>
+    <button type="button" class="icon-button permissions-origin-menu-button permissions-origin-button" data-menu="permissions-origin-menu" data-menu-position="below left"><span class="icon-button-inner"><span class="icon" data-icon="kebab-menu"></span></span></button>
 </template>
 
 <template id="permissions-origin-menu-template"><div class="popup-menu-container" tabindex="-1" role="dialog"><div class="popup-menu"><div class="popup-menu-body">
-    <button class="popup-menu-item" data-menu-action="remove">Remove</button>
+    <button type="button" class="popup-menu-item" data-menu-action="remove">Remove</button>
 </div></div></div></template>
 
 
diff --git a/ext/popup.html b/ext/popup.html
index 02248b1771..92186e4f5e 100644
--- a/ext/popup.html
+++ b/ext/popup.html
@@ -70,14 +70,14 @@ <h3>Default Profile</h3>
     <div class="content-sidebar scrollbar" id="content-sidebar">
         <div class="content-sidebar-inner">
             <div class="content-sidebar-top-pre">
-                <button class="sidebar-button danger" id="close-button" title="Close popup" data-hotkey='["close","title","Close popup ({0})"]'><span class="sidebar-button-icon icon" data-icon="cross"></span></button>
+                <button type="button" class="sidebar-button danger" id="close-button" title="Close popup" data-hotkey='["close","title","Close popup ({0})"]'><span class="sidebar-button-icon icon" data-icon="cross"></span></button>
             </div>
             <div class="content-sidebar-top">
-                <button class="sidebar-button" disabled id="navigate-previous-button" title="Previous definition" data-hotkey='["historyBackward","title","Previous definition ({0})"]'><span class="sidebar-button-icon icon" data-icon="left-chevron"></span></button>
-                <button class="sidebar-button" disabled id="navigate-next-button" title="Next definition" data-hotkey='["historyForward","title","Next definition ({0})"]'><span class="sidebar-button-icon icon" data-icon="right-chevron"></span></button>
+                <button type="button" class="sidebar-button" disabled id="navigate-previous-button" title="Previous definition" data-hotkey='["historyBackward","title","Previous definition ({0})"]'><span class="sidebar-button-icon icon" data-icon="left-chevron"></span></button>
+                <button type="button" class="sidebar-button" disabled id="navigate-next-button" title="Next definition" data-hotkey='["historyForward","title","Next definition ({0})"]'><span class="sidebar-button-icon icon" data-icon="right-chevron"></span></button>
             </div>
             <div class="content-sidebar-bottom">
-                <button class="sidebar-button" id="profile-button"><span class="sidebar-button-icon icon" data-icon="profile"></span></button>
+                <button type="button" class="sidebar-button" id="profile-button"><span class="sidebar-button-icon icon" data-icon="profile"></span></button>
             </div>
         </div>
     </div>
diff --git a/ext/search.html b/ext/search.html
index be2959378a..460c0df890 100644
--- a/ext/search.html
+++ b/ext/search.html
@@ -50,8 +50,8 @@ <h1>Yomitan Search</h1>
                             </div>
                             <div class="search-textbox-container">
                                 <textarea id="search-textbox" class="scrollbar" placeholder="Input a term, expression, sentence, or block of text" autocomplete="off" lang="ja" autofocus></textarea>
-                                <button id="search-back-button" class="search-button" hidden><span class="icon" data-icon="left-chevron"></span></button>
-                                <button id="search-button" class="search-button"><span class="icon" data-icon="magnifying-glass"></span></button>
+                                <button type="button" id="search-back-button" class="search-button" hidden><span class="icon" data-icon="left-chevron"></span></button>
+                                <button type="button" id="search-button" class="search-button"><span class="icon" data-icon="magnifying-glass"></span></button>
                             </div>
                         </div>
 
diff --git a/ext/settings.html b/ext/settings.html
index 3b410ccee2..f204a453a3 100644
--- a/ext/settings.html
+++ b/ext/settings.html
@@ -106,7 +106,7 @@ <h1>Yomitan Settings</h1>
                 <div class="settings-item-label">Configure profiles&hellip;</div>
             </div>
             <div class="settings-item-right open-panel-button-container">
-                <button class="icon-button"><span class="icon-button-inner"><span class="icon" data-icon="material-right-arrow"></span></span></button>
+                <button type="button" class="icon-button"><span class="icon-button-inner"><span class="icon" data-icon="material-right-arrow"></span></span></button>
             </div>
         </div></div>
     </div>
@@ -127,7 +127,7 @@ <h1>Yomitan Settings</h1>
                 </div>
             </div>
             <div class="settings-item-right open-panel-button-container">
-                <button class="icon-button"><span class="icon-button-inner"><span class="icon" data-icon="material-right-arrow"></span></span></button>
+                <button type="button" class="icon-button"><span class="icon-button-inner"><span class="icon" data-icon="material-right-arrow"></span></span></button>
             </div>
         </div></div>
         <div class="settings-item">
@@ -147,7 +147,7 @@ <h1>Yomitan Settings</h1>
                     </div>
                 </div>
                 <div class="settings-item-right">
-                    <button id="storage-refresh" class="low-emphasis">Refresh</button>
+                    <button type="button" id="storage-refresh" class="low-emphasis">Refresh</button>
                 </div>
             </div>
         </div>
@@ -280,7 +280,7 @@ <h1>Yomitan Settings</h1>
                         <div class="settings-item-label">Secondary dictionaries&hellip;</div>
                     </div>
                     <div class="settings-item-right open-panel-button-container">
-                        <button class="icon-button"><span class="icon-button-inner"><span class="icon" data-icon="material-right-arrow"></span></span></button>
+                        <button type="button" class="icon-button"><span class="icon-button-inner"><span class="icon" data-icon="material-right-arrow"></span></span></button>
                     </div>
                 </div></div>
             </div>
@@ -319,7 +319,7 @@ <h1>Yomitan Settings</h1>
                         </div>
                         <div class="settings-item-right">
                             <div class="horizontal-flex horizontal-flex-nowrap">
-                                <button class="low-emphasis" id="sort-frequency-dictionary-order-auto">Auto</button>
+                                <button type="button" class="low-emphasis" id="sort-frequency-dictionary-order-auto">Auto</button>
                                 <select id="sort-frequency-dictionary-order">
                                     <option value="descending">Occurrence-based</option>
                                     <option value="ascending">Rank-based</option>
@@ -411,7 +411,7 @@ <h1>Yomitan Settings</h1>
                 <div class="settings-item-label">Configure advanced scanning inputs&hellip; <span class="light no-wrap">(<span class="scanning-input-count">#</span> defined)</span></div>
             </div>
             <div class="settings-item-right open-panel-button-container">
-                <button class="icon-button"><span class="icon-button-inner"><span class="icon" data-icon="material-right-arrow"></span></span></button>
+                <button type="button" class="icon-button"><span class="icon-button-inner"><span class="icon" data-icon="material-right-arrow"></span></span></button>
             </div>
         </div></div>
         <div class="settings-item">
@@ -615,7 +615,7 @@ <h1>Yomitan Settings</h1>
                 <div class="settings-item-label">Configure input action prevention&hellip;</div>
             </div>
             <div class="settings-item-right open-panel-button-container">
-                <button class="icon-button"><span class="icon-button-inner"><span class="icon" data-icon="material-right-arrow"></span></span></button>
+                <button type="button" class="icon-button"><span class="icon-button-inner"><span class="icon" data-icon="material-right-arrow"></span></span></button>
             </div>
         </div></div>
     </div>
@@ -938,7 +938,7 @@ <h1>Yomitan Settings</h1>
                 <div class="settings-item-label">Configure collapsible dictionaries&hellip;</div>
             </div>
             <div class="settings-item-right open-panel-button-container">
-                <button class="icon-button"><span class="icon-button-inner"><span class="icon" data-icon="material-right-arrow"></span></span></button>
+                <button type="button" class="icon-button"><span class="icon-button-inner"><span class="icon" data-icon="material-right-arrow"></span></span></button>
             </div>
         </div></div>
         <div class="settings-item settings-item-button" data-modal-action="show,custom-css"><div class="settings-item-inner">
@@ -946,7 +946,7 @@ <h1>Yomitan Settings</h1>
                 <div class="settings-item-label">Configure custom CSS&hellip;</div>
             </div>
             <div class="settings-item-right open-panel-button-container">
-                <button class="icon-button"><span class="icon-button-inner"><span class="icon" data-icon="material-right-arrow"></span></span></button>
+                <button type="button" class="icon-button"><span class="icon-button-inner"><span class="icon" data-icon="material-right-arrow"></span></span></button>
             </div>
         </div></div>
     </div>
@@ -1323,7 +1323,7 @@ <h1>Yomitan Settings</h1>
                 <div class="settings-item-label">Configure audio playback sources&hellip;</div>
             </div>
             <div class="settings-item-right open-panel-button-container">
-                <button class="icon-button"><span class="icon-button-inner"><span class="icon" data-icon="material-right-arrow"></span></span></button>
+                <button type="button" class="icon-button"><span class="icon-button-inner"><span class="icon" data-icon="material-right-arrow"></span></span></button>
             </div>
         </div></div>
     </div>
@@ -1398,7 +1398,7 @@ <h1>Yomitan Settings</h1>
                     A setup guide can be found <a href="https://github.com/siikamiika/yomichan-mecab-installer/blob/master/README.md" target="_blank" rel="noopener noreferrer">here</a>.
                 </p>
                 <div class="margin-above flex-row-nowrap">
-                    <button id="test-mecab-button">Test</button>
+                    <button type="button" id="test-mecab-button">Test</button>
                     <div id="test-mecab-results" class="flex-margin-left" hidden></div>
                 </div>
                 <p class="margin-above">
@@ -1444,7 +1444,7 @@ <h1>Yomitan Settings</h1>
             </div>
             <div class="settings-item-right">
                 <div class="horizontal-flex horizontal-flex-nowrap">
-                    <button class="low-emphasis" data-modal-action="show,sentence-termination-characters" id="configure-sentence-termination-characters-button" hidden>Configure&hellip;</button>
+                    <button type="button" class="low-emphasis" data-modal-action="show,sentence-termination-characters" id="configure-sentence-termination-characters-button" hidden>Configure&hellip;</button>
                     <select data-setting="sentenceParsing.terminationCharacterMode"
                         data-transform='{
                             "type": "setVisibility",
@@ -1510,7 +1510,7 @@ <h1>Yomitan Settings</h1>
                 <div class="settings-item-label">Configure custom text replacement patterns&hellip;</div>
             </div>
             <div class="settings-item-right open-panel-button-container">
-                <button class="icon-button"><span class="icon-button-inner"><span class="icon" data-icon="material-right-arrow"></span></span></button>
+                <button type="button" class="icon-button"><span class="icon-button-inner"><span class="icon" data-icon="material-right-arrow"></span></span></button>
             </div>
         </div></div>
         <div class="settings-item"><div class="settings-item-inner settings-item-inner-wrappable">
@@ -1849,8 +1849,8 @@ <h1>Yomitan Settings</h1>
                     If an error occurs, Anki and/or AnkiConnect may need to be updated.
                 </p>
                 <div class="test-anki-note-viewer-container">
-                    <button class="test-anki-note-viewer-button" data-mode="browse">Test <em>Card browser</em></button>
-                    <button class="test-anki-note-viewer-button" data-mode="edit">Test <em>Note editor</em></button>
+                    <button type="button" class="test-anki-note-viewer-button" data-mode="browse">Test <em>Card browser</em></button>
+                    <button type="button" class="test-anki-note-viewer-button" data-mode="edit">Test <em>Note editor</em></button>
                     <div class="test-anki-note-viewer-results" id="test-anki-note-viewer-results" hidden></div>
                 </div>
                 <p class="margin-above">
@@ -1891,7 +1891,7 @@ <h1>Yomitan Settings</h1>
                 <div class="settings-item-label">Configure Anki card format&hellip;</div>
             </div>
             <div class="settings-item-right open-panel-button-container">
-                <button class="icon-button"><span class="icon-button-inner"><span class="icon" data-icon="material-right-arrow"></span></span></button>
+                <button type="button" class="icon-button"><span class="icon-button-inner"><span class="icon" data-icon="material-right-arrow"></span></span></button>
             </div>
         </div></div>
         <div class="settings-item settings-item-button advanced-only" data-modal-action="show,anki-card-templates"><div class="settings-item-inner">
@@ -1899,7 +1899,7 @@ <h1>Yomitan Settings</h1>
                 <div class="settings-item-label">Configure Anki card templates&hellip;</div>
             </div>
             <div class="settings-item-right open-panel-button-container">
-                <button class="icon-button"><span class="icon-button-inner"><span class="icon" data-icon="material-right-arrow"></span></span></button>
+                <button type="button" class="icon-button"><span class="icon-button-inner"><span class="icon" data-icon="material-right-arrow"></span></span></button>
             </div>
         </div></div>
     </div>
@@ -2011,7 +2011,7 @@ <h1>Yomitan Settings</h1>
                 <div class="settings-item-label">Configure standard keyboard shortcuts&hellip;</div>
             </div>
             <div class="settings-item-right open-panel-button-container">
-                <button class="icon-button"><span class="icon-button-inner"><span class="icon" data-icon="material-right-arrow"></span></span></button>
+                <button type="button" class="icon-button"><span class="icon-button-inner"><span class="icon" data-icon="material-right-arrow"></span></span></button>
             </div>
         </div></div>
         <div class="settings-item settings-item-button" data-modal-action="show,extension-keyboard-shortcuts"><div class="settings-item-inner">
@@ -2019,7 +2019,7 @@ <h1>Yomitan Settings</h1>
                 <div class="settings-item-label">Configure native keyboard shortcuts&hellip;</div>
             </div>
             <div class="settings-item-right open-panel-button-container">
-                <button class="icon-button"><span class="icon-button-inner"><span class="icon" data-icon="material-right-arrow"></span></span></button>
+                <button type="button" class="icon-button"><span class="icon-button-inner"><span class="icon" data-icon="material-right-arrow"></span></span></button>
             </div>
         </div></div>
     </div>
@@ -2047,14 +2047,14 @@ <h1>Yomitan Settings</h1>
             <div class="settings-item-right settings-item-button-group-container">
                 <div class="settings-item-button-group">
                     <div class="settings-item-button-group-item">
-                        <button class="low-emphasis" id="settings-import-button">Import Settings</button>
+                        <button type="button" class="low-emphasis" id="settings-import-button">Import Settings</button>
                         <div hidden><input type="file" id="settings-import-file" accept=".json,application/json"></div>
                     </div>
                     <div class="settings-item-button-group-item">
-                        <button class="low-emphasis" id="settings-export-button">Export Settings</button>
+                        <button type="button" class="low-emphasis" id="settings-export-button">Export Settings</button>
                     </div>
                     <div class="settings-item-button-group-item">
-                        <button class="low-emphasis danger" id="settings-reset-button">Reset Settings</button>
+                        <button type="button" class="low-emphasis danger" id="settings-reset-button">Reset Settings</button>
                     </div>
                 </div>
             </div>
@@ -2082,11 +2082,11 @@ <h1>Yomitan Settings</h1>
             <div class="settings-item-right settings-item-button-group-container">
                 <div class="settings-item-button-group">
                     <div class="settings-item-button-group-item">
-                        <button class="low-emphasis" id="settings-import-db-button">Import Dictionary Collection</button>
+                        <button type="button" class="low-emphasis" id="settings-import-db-button">Import Dictionary Collection</button>
                         <div hidden><input type="file" id="settings-import-db" accept=".json,application/json"></div>
                     </div>
                     <div class="settings-item-button-group-item">
-                        <button class="low-emphasis" id="settings-export-db-button">Export Dictionary Collection</button>
+                        <button type="button" class="low-emphasis" id="settings-export-db-button">Export Dictionary Collection</button>
                     </div>
                 </div>
             </div>
@@ -2224,10 +2224,10 @@ <h1>Yomitan Settings</h1>
     <div class="fab-container-right">
         <div class="fab-container-right-inner1"><div class="fab-container-right-inner2">
             <div class="fab-container-item fab-container-item-popup-preview">
-                <button class="fab-button icon-button" data-action="toggle-preview-sidebar"><span class="icon-button-inner"><span class="fab-button-background"></span><span class="icon" data-icon="popup"></span></span></button>
+                <button type="button" class="fab-button icon-button" data-action="toggle-preview-sidebar"><span class="icon-button-inner"><span class="fab-button-background"></span><span class="icon" data-icon="popup"></span></span></button>
             </div>
             <div class="fab-container-item">
-                <button class="fab-button icon-button" data-action="toggle-sidebar"><span class="icon-button-inner"><span class="fab-button-background"></span><span class="icon" data-icon="hamburger-menu"></span></span></button>
+                <button type="button" class="fab-button icon-button" data-action="toggle-sidebar"><span class="icon-button-inner"><span class="fab-button-background"></span><span class="icon" data-icon="hamburger-menu"></span></span></button>
             </div>
         </div></div>
     </div>
@@ -2256,8 +2256,8 @@ <h1>Yomitan Settings</h1>
         <div class="modal-title">Profiles</div>
         <div class="modal-header-button-container">
             <div class="modal-header-button-group">
-                <button class="icon-button modal-header-button" data-modal-action="expand"><span class="icon-button-inner"><span class="icon" data-icon="expand"></span></span></button>
-                <button class="icon-button modal-header-button" data-modal-action="collapse"><span class="icon-button-inner"><span class="icon" data-icon="collapse"></span></span></button>
+                <button type="button" class="icon-button modal-header-button" data-modal-action="expand"><span class="icon-button-inner"><span class="icon" data-icon="expand"></span></span></button>
+                <button type="button" class="icon-button modal-header-button" data-modal-action="collapse"><span class="icon-button-inner"><span class="icon" data-icon="collapse"></span></span></button>
             </div>
         </div>
     </div>
@@ -2271,11 +2271,11 @@ <h1>Yomitan Settings</h1>
         </div>
         <div class="profile-entry-list generic-list" id="profile-entry-list"></div>
         <div class="profile-add-button-container">
-            <button class="low-emphasis" id="profile-add-button">Add</button>
+            <button type="button" class="low-emphasis" id="profile-add-button">Add</button>
         </div>
     </div>
     <div class="modal-footer">
-        <button data-modal-action="hide">Close</button>
+        <button type="button" data-modal-action="hide">Close</button>
     </div>
 </div></div>
 
@@ -2284,8 +2284,8 @@ <h1>Yomitan Settings</h1>
         <div class="modal-title">Profile Conditions</div>
         <div class="modal-header-button-container">
             <div class="modal-header-button-group">
-                <button class="icon-button modal-header-button" data-modal-action="expand"><span class="icon-button-inner"><span class="icon" data-icon="expand"></span></span></button>
-                <button class="icon-button modal-header-button" data-modal-action="collapse"><span class="icon-button-inner"><span class="icon" data-icon="collapse"></span></span></button>
+                <button type="button" class="icon-button modal-header-button" data-modal-action="expand"><span class="icon-button-inner"><span class="icon" data-icon="expand"></span></span></button>
+                <button type="button" class="icon-button modal-header-button" data-modal-action="collapse"><span class="icon-button-inner"><span class="icon" data-icon="collapse"></span></span></button>
             </div>
         </div>
     </div>
@@ -2322,11 +2322,11 @@ <h1>Yomitan Settings</h1>
         <div class="profile-condition-group-list-info">
             <div class="profile-condition-groups-empty-info"><em>No conditions set up.</em></div>
             <div class="profile-condition-group-list-info-space"></div>
-            <button class="low-emphasis" id="profile-add-condition-group">Add Group</button>
+            <button type="button" class="low-emphasis" id="profile-add-condition-group">Add Group</button>
         </div>
     </div>
     <div class="modal-footer">
-        <button data-modal-action="hide">Close</button>
+        <button type="button" data-modal-action="hide">Close</button>
     </div>
 </div></div>
 
@@ -2335,8 +2335,8 @@ <h1>Yomitan Settings</h1>
         <div class="modal-title">Copy Profile</div>
         <div class="modal-header-button-container">
             <div class="modal-header-button-group">
-                <button class="icon-button modal-header-button" data-modal-action="expand"><span class="icon-button-inner"><span class="icon" data-icon="expand"></span></span></button>
-                <button class="icon-button modal-header-button" data-modal-action="collapse"><span class="icon-button-inner"><span class="icon" data-icon="collapse"></span></span></button>
+                <button type="button" class="icon-button modal-header-button" data-modal-action="expand"><span class="icon-button-inner"><span class="icon" data-icon="expand"></span></span></button>
+                <button type="button" class="icon-button modal-header-button" data-modal-action="collapse"><span class="icon-button-inner"><span class="icon" data-icon="collapse"></span></span></button>
             </div>
         </div>
     </div>
@@ -2345,8 +2345,8 @@ <h1>Yomitan Settings</h1>
         <select class="form-control" id="profile-copy-source-select"></select>
     </div>
     <div class="modal-footer">
-        <button class="low-emphasis" data-modal-action="hide">Cancel</button>
-        <button id="profile-copy-confirm-button">Copy Profile</button>
+        <button type="button" class="low-emphasis" data-modal-action="hide">Cancel</button>
+        <button type="button" id="profile-copy-confirm-button">Copy Profile</button>
     </div>
 </div></div>
 
@@ -2358,8 +2358,8 @@ <h1>Yomitan Settings</h1>
         </p>
     </div>
     <div class="modal-footer">
-        <button class="low-emphasis" data-modal-action="hide">Cancel</button>
-        <button class="danger" id="profile-remove-confirm-button">Remove Profile</button>
+        <button type="button" class="low-emphasis" data-modal-action="hide">Cancel</button>
+        <button type="button" class="danger" id="profile-remove-confirm-button">Remove Profile</button>
     </div>
 </div></div>
 
@@ -2370,7 +2370,7 @@ <h1>Yomitan Settings</h1>
     <div class="profile-entry-cell"><label class="radio"><input type="radio" class="profile-entry-is-default-radio" name="profile-entry-default-radio"><span class="radio-body"><span class="radio-border"></span><span class="radio-dot"></span></span></label></div>
     <div class="profile-entry-cell"><input class="profile-entry-name-input" type="text" autocomplete="off" placeholder="Profile name"></div>
     <div class="profile-entry-cell"><a tabindex="0" class="profile-entry-condition-count-link"><span class="profile-entry-condition-count">0</span></a></div>
-    <div class="profile-entry-cell input-height-icon-button-container"><button class="icon-button profile-entry-menu-button" data-menu="profile-menu" data-menu-position="below left"><span class="icon-button-inner"><span class="icon" data-icon="kebab-menu"></span></span></button></div>
+    <div class="profile-entry-cell input-height-icon-button-container"><button type="button" class="icon-button profile-entry-menu-button" data-menu="profile-menu" data-menu-position="below left"><span class="icon-button-inner"><span class="icon" data-icon="kebab-menu"></span></span></button></div>
 </div></template>
 
 <template id="profile-condition-group-template"><div class="profile-condition-group">
@@ -2378,7 +2378,7 @@ <h1>Yomitan Settings</h1>
     <div class="profile-condition-list-info">
         <div class="profile-condition-group-separator-label">or</div>
         <div class="profile-condition-list-info-space"></div>
-        <button class="profile-condition-add-button low-emphasis">Add</button>
+        <button type="button" class="profile-condition-add-button low-emphasis">Add</button>
     </div>
 </div></template>
 
@@ -2390,28 +2390,28 @@ <h1>Yomitan Settings</h1>
         <div class="profile-condition-input-container">
             <input type="text" class="profile-condition-input" autocomplete="off" spellcheck="false">
             <div class="input-height-icon-button-container mouse-button-container" hidden>
-                <button class="icon-button profile-condition-mouse-button mouse-button"><span class="icon-button-inner"><span class="icon" data-icon="mouse"></span></span></button>
+                <button type="button" class="icon-button profile-condition-mouse-button mouse-button"><span class="icon-button-inner"><span class="icon" data-icon="mouse"></span></span></button>
             </div>
         </div>
     </div>
     <div class="profile-condition-menu-button-container input-height-icon-button-container">
-        <button class="icon-button profile-condition-menu-button" data-menu="profile-condition-menu" data-menu-position="below left"><span class="icon-button-inner"><span class="icon" data-icon="kebab-menu"></span></span></button>
+        <button type="button" class="icon-button profile-condition-menu-button" data-menu="profile-condition-menu" data-menu-position="below left"><span class="icon-button-inner"><span class="icon" data-icon="kebab-menu"></span></span></button>
     </div>
 </div></template>
 
 <template id="profile-menu-template"><div class="popup-menu-container" tabindex="-1" role="dialog"><div class="popup-menu"><div class="popup-menu-body">
-    <button class="popup-menu-item" data-menu-action="moveUp">Move up</button>
-    <button class="popup-menu-item" data-menu-action="moveDown">Move down</button>
-    <button class="popup-menu-item" data-menu-action="copyFrom">Copy from&hellip;</button>
-    <button class="popup-menu-item" data-menu-action="editConditions">Edit conditions&hellip;</button>
-    <button class="popup-menu-item" data-menu-action="duplicate">Duplicate</button>
-    <button class="popup-menu-item" data-menu-action="delete">Delete</button>
+    <button type="button" class="popup-menu-item" data-menu-action="moveUp">Move up</button>
+    <button type="button" class="popup-menu-item" data-menu-action="moveDown">Move down</button>
+    <button type="button" class="popup-menu-item" data-menu-action="copyFrom">Copy from&hellip;</button>
+    <button type="button" class="popup-menu-item" data-menu-action="editConditions">Edit conditions&hellip;</button>
+    <button type="button" class="popup-menu-item" data-menu-action="duplicate">Duplicate</button>
+    <button type="button" class="popup-menu-item" data-menu-action="delete">Delete</button>
 </div></div></div></template>
 
 <template id="profile-condition-menu-template"><div class="popup-menu-container" tabindex="-1" role="dialog"><div class="popup-menu"><div class="popup-menu-body">
-    <button class="popup-menu-item" data-menu-action="resetValue">Reset value</button>
-    <button class="popup-menu-item" data-menu-action="delete">Delete</button>
-    <button class="popup-menu-item" data-menu-action="deleteGroup">Delete group</button>
+    <button type="button" class="popup-menu-item" data-menu-action="resetValue">Reset value</button>
+    <button type="button" class="popup-menu-item" data-menu-action="delete">Delete</button>
+    <button type="button" class="popup-menu-item" data-menu-action="deleteGroup">Delete group</button>
 </div></div></div></template>
 
 
@@ -2421,8 +2421,8 @@ <h1>Yomitan Settings</h1>
         <div class="modal-title">Dictionaries</div>
         <div class="modal-header-button-container">
             <div class="modal-header-button-group">
-                <button class="icon-button modal-header-button" data-modal-action="expand"><span class="icon-button-inner"><span class="icon" data-icon="expand"></span></span></button>
-                <button class="icon-button modal-header-button" data-modal-action="collapse"><span class="icon-button-inner"><span class="icon" data-icon="collapse"></span></span></button>
+                <button type="button" class="icon-button modal-header-button" data-modal-action="expand"><span class="icon-button-inner"><span class="icon" data-icon="expand"></span></span></button>
+                <button type="button" class="icon-button modal-header-button" data-modal-action="collapse"><span class="icon-button-inner"><span class="icon" data-icon="collapse"></span></span></button>
             </div>
         </div>
     </div>
@@ -2480,10 +2480,10 @@ <h1>Yomitan Settings</h1>
         <div class="progress-bar-track"><div class="progress-bar"></div></div>
     </div>
     <div class="modal-footer">
-        <button class="low-emphasis danger dictionary-database-mutating-input" id="dictionary-delete-all-button">Delete All</button>
-        <button class="low-emphasis dictionary-database-mutating-input" id="dictionary-check-integrity">Check Integrity</button>
-        <button class="low-emphasis dictionary-database-mutating-input" id="dictionary-import-file-button">Import</button>
-        <button data-modal-action="hide">Close</button>
+        <button type="button" class="low-emphasis danger dictionary-database-mutating-input" id="dictionary-delete-all-button">Delete All</button>
+        <button type="button" class="low-emphasis dictionary-database-mutating-input" id="dictionary-check-integrity">Check Integrity</button>
+        <button type="button" class="low-emphasis dictionary-database-mutating-input" id="dictionary-import-file-button">Import</button>
+        <button type="button" data-modal-action="hide">Close</button>
     </div>
 </div></div>
 
@@ -2495,8 +2495,8 @@ <h1>Yomitan Settings</h1>
         <p class="danger-text">This action cannot be undone.</p>
     </div>
     <div class="modal-footer">
-        <button class="low-emphasis" data-modal-action="hide">Cancel</button>
-        <button class="danger" data-modal-action="hide" id="dictionary-confirm-delete-button">Delete</button>
+        <button type="button" class="low-emphasis" data-modal-action="hide">Cancel</button>
+        <button type="button" class="danger" data-modal-action="hide" id="dictionary-confirm-delete-button">Delete</button>
     </div>
 </div></div>
 
@@ -2507,8 +2507,8 @@ <h1>Yomitan Settings</h1>
         <p class="danger-text">This action cannot be undone.</p>
     </div>
     <div class="modal-footer">
-        <button class="low-emphasis" data-modal-action="hide">Cancel</button>
-        <button class="danger" data-modal-action="hide" id="dictionary-confirm-delete-all-button">Delete</button>
+        <button type="button" class="low-emphasis" data-modal-action="hide">Cancel</button>
+        <button type="button" class="danger" data-modal-action="hide" id="dictionary-confirm-delete-all-button">Delete</button>
     </div>
 </div></div>
 
@@ -2517,8 +2517,8 @@ <h1>Yomitan Settings</h1>
         <div class="modal-title">Secondary Search Dictionaries</div>
         <div class="modal-header-button-container">
             <div class="modal-header-button-group">
-                <button class="icon-button modal-header-button" data-modal-action="expand"><span class="icon-button-inner"><span class="icon" data-icon="expand"></span></span></button>
-                <button class="icon-button modal-header-button" data-modal-action="collapse"><span class="icon-button-inner"><span class="icon" data-icon="collapse"></span></span></button>
+                <button type="button" class="icon-button modal-header-button" data-modal-action="expand"><span class="icon-button-inner"><span class="icon" data-icon="expand"></span></span></button>
+                <button type="button" class="icon-button modal-header-button" data-modal-action="collapse"><span class="icon-button-inner"><span class="icon" data-icon="collapse"></span></span></button>
             </div>
         </div>
     </div>
@@ -2530,7 +2530,7 @@ <h1>Yomitan Settings</h1>
         <div id="secondary-search-dictionary-list" class="secondary-search-dictionary-list"></div>
     </div>
     <div class="modal-footer">
-        <button data-modal-action="hide">Close</button>
+        <button type="button" data-modal-action="hide">Close</button>
     </div>
 </div></div>
 
@@ -2539,8 +2539,8 @@ <h1>Yomitan Settings</h1>
         <div class="modal-title">Collapsible Dictionaries</div>
         <div class="modal-header-button-container">
             <div class="modal-header-button-group">
-                <button class="icon-button modal-header-button" data-modal-action="expand"><span class="icon-button-inner"><span class="icon" data-icon="expand"></span></span></button>
-                <button class="icon-button modal-header-button" data-modal-action="collapse"><span class="icon-button-inner"><span class="icon" data-icon="collapse"></span></span></button>
+                <button type="button" class="icon-button modal-header-button" data-modal-action="expand"><span class="icon-button-inner"><span class="icon" data-icon="expand"></span></span></button>
+                <button type="button" class="icon-button modal-header-button" data-modal-action="collapse"><span class="icon-button-inner"><span class="icon" data-icon="collapse"></span></span></button>
             </div>
         </div>
     </div>
@@ -2556,7 +2556,7 @@ <h1>Yomitan Settings</h1>
         <div id="collapsible-dictionary-list" class="collapsible-dictionary-list"></div>
     </div>
     <div class="modal-footer">
-        <button data-modal-action="hide">Close</button>
+        <button type="button" data-modal-action="hide">Close</button>
     </div>
 </div></div>
 
@@ -2565,8 +2565,8 @@ <h1>Yomitan Settings</h1>
         <div class="modal-title">Collapsible Dictionary Info</div>
         <div class="modal-header-button-container">
             <div class="modal-header-button-group">
-                <button class="icon-button modal-header-button" data-modal-action="expand"><span class="icon-button-inner"><span class="icon" data-icon="expand"></span></span></button>
-                <button class="icon-button modal-header-button" data-modal-action="collapse"><span class="icon-button-inner"><span class="icon" data-icon="collapse"></span></span></button>
+                <button type="button" class="icon-button modal-header-button" data-modal-action="expand"><span class="icon-button-inner"><span class="icon" data-icon="expand"></span></span></button>
+                <button type="button" class="icon-button modal-header-button" data-modal-action="collapse"><span class="icon-button-inner"><span class="icon" data-icon="collapse"></span></span></button>
             </div>
         </div>
     </div>
@@ -2625,7 +2625,7 @@ <h1>Yomitan Settings</h1>
 </div>
     </div>
     <div class="modal-footer">
-        <button data-modal-action="hide">Close</button>
+        <button type="button" data-modal-action="hide">Close</button>
     </div>
 </div></div>
 
@@ -2663,7 +2663,7 @@ <h1>Yomitan Settings</h1>
         </div></div>
     </div>
     <div class="modal-footer">
-        <button data-modal-action="hide">Close</button>
+        <button type="button" data-modal-action="hide">Close</button>
     </div>
 </div></div>
 
@@ -2681,7 +2681,7 @@ <h1>Yomitan Settings</h1>
         <div class="dictionary-counts"></div>
     </div>
     <div class="modal-footer">
-        <button data-modal-action="hide">Close</button>
+        <button type="button" data-modal-action="hide">Close</button>
     </div>
 </div></div>
 
@@ -2694,8 +2694,8 @@ <h1>Yomitan Settings</h1>
         </div>
     </div>
     <div class="modal-footer">
-        <button class="low-emphasis" data-modal-action="hide">Cancel</button>
-        <button data-modal-action="hide" id="dictionary-move-button">Move</button>
+        <button type="button" class="low-emphasis" data-modal-action="hide">Cancel</button>
+        <button type="button" data-modal-action="hide" id="dictionary-move-button">Move</button>
     </div>
 </div></div>
 
@@ -2708,15 +2708,15 @@ <h1>Yomitan Settings</h1>
         <span>
             <strong class="dictionary-title"></strong> <span class="light dictionary-version"></span>
         </span>
-        <button class="dictionary-outdated-button" hidden>
+        <button type="button" class="dictionary-outdated-button" hidden>
             <div class="badge warning-badge"><span class="icon" data-icon="exclamation-point-short"></span></div>
         </button>
-        <button class="dictionary-integrity-button" hidden>
+        <button type="button" class="dictionary-integrity-button" hidden>
             <div class="badge info-badge badge-small-icon"><span class="icon" data-icon="checkmark"></span></div>
         </button>
     </div>
     <input type="number" step="1" class="short-height dictionary-priority">
-    <button class="icon-button dictionary-menu-button" data-menu="dictionary-menu" data-menu-position="below left"><span class="icon-button-inner"><span class="icon" data-icon="kebab-menu"></span></span></button>
+    <button type="button" class="icon-button dictionary-menu-button" data-menu="dictionary-menu" data-menu-position="below left"><span class="icon-button-inner"><span class="icon" data-icon="kebab-menu"></span></span></button>
 </template>
 
 <template id="dictionary-details-entry-template"><div class="dictionary-details-entry">
@@ -2731,7 +2731,7 @@ <h1>Yomitan Settings</h1>
         <span>
             <strong class="dictionary-title">Unassociated Data</strong> <span class="light dictionary-total-count"></span>
         </span>
-        <button class="dictionary-integrity-button">
+        <button type="button" class="dictionary-integrity-button">
             <div class="badge warning-badge"><span class="icon" data-icon="exclamation-point-short"></span></div>
         </button>
     </div>
@@ -2740,11 +2740,11 @@ <h1>Yomitan Settings</h1>
 </template>
 
 <template id="dictionary-menu-template"><div class="popup-menu-container" tabindex="-1" role="dialog"><div class="popup-menu"><div class="popup-menu-body">
-    <button class="popup-menu-item" data-menu-action="showDetails">Details&hellip;</button>
-    <button class="popup-menu-item" data-menu-action="moveUp">Move up</button>
-    <button class="popup-menu-item" data-menu-action="moveDown">Move down</button>
-    <button class="popup-menu-item" data-menu-action="moveTo">Move to&hellip;</button>
-    <button class="popup-menu-item" data-menu-action="delete">Delete</button>
+    <button type="button" class="popup-menu-item" data-menu-action="showDetails">Details&hellip;</button>
+    <button type="button" class="popup-menu-item" data-menu-action="moveUp">Move up</button>
+    <button type="button" class="popup-menu-item" data-menu-action="moveDown">Move down</button>
+    <button type="button" class="popup-menu-item" data-menu-action="moveTo">Move to&hellip;</button>
+    <button type="button" class="popup-menu-item" data-menu-action="delete">Delete</button>
 </div></div></div></template>
 
 <template id="secondary-search-dictionary-template"><div class="secondary-search-dictionary-item horizontal-flex">
@@ -2775,8 +2775,8 @@ <h1>Yomitan Settings</h1>
             <div class="modal-title">Custom CSS</div>
             <div class="modal-header-button-container">
                 <div class="modal-header-button-group">
-                    <button class="icon-button modal-header-button" data-modal-action="expand"><span class="icon-button-inner"><span class="icon" data-icon="expand"></span></span></button>
-                    <button class="icon-button modal-header-button" data-modal-action="collapse"><span class="icon-button-inner"><span class="icon" data-icon="collapse"></span></span></button>
+                    <button type="button" class="icon-button modal-header-button" data-modal-action="expand"><span class="icon-button-inner"><span class="icon" data-icon="expand"></span></span></button>
+                    <button type="button" class="icon-button modal-header-button" data-modal-action="collapse"><span class="icon-button-inner"><span class="icon" data-icon="collapse"></span></span></button>
                 </div>
             </div>
         </div>
@@ -2787,7 +2787,7 @@ <h1>Yomitan Settings</h1>
             <textarea class="no-wrap" autocomplete="off" spellcheck="false" id="custom-popup-outer-css" data-setting="general.customPopupOuterCss" data-tab-action="indent,4"></textarea>
         </div>
         <div class="modal-footer">
-            <button data-modal-action="hide">Close</button>
+            <button type="button" data-modal-action="hide">Close</button>
         </div>
     </div></div>
     <div class="modal-content-container1-fade"></div>
@@ -2800,8 +2800,8 @@ <h1>Yomitan Settings</h1>
         <div class="modal-title">Audio Sources</div>
         <div class="modal-header-button-container">
             <div class="modal-header-button-group">
-                <button class="icon-button modal-header-button" data-modal-action="expand"><span class="icon-button-inner"><span class="icon" data-icon="expand"></span></span></button>
-                <button class="icon-button modal-header-button" data-modal-action="collapse"><span class="icon-button-inner"><span class="icon" data-icon="collapse"></span></span></button>
+                <button type="button" class="icon-button modal-header-button" data-modal-action="expand"><span class="icon-button-inner"><span class="icon" data-icon="expand"></span></span></button>
+                <button type="button" class="icon-button modal-header-button" data-modal-action="collapse"><span class="icon-button-inner"><span class="icon" data-icon="collapse"></span></span></button>
             </div>
         </div>
     </div>
@@ -2825,8 +2825,8 @@ <h1>Yomitan Settings</h1>
         </div>
     </div>
     <div class="modal-footer">
-        <button id="audio-source-add" class="low-emphasis">Add</button>
-        <button data-modal-action="hide">Close</button>
+        <button type="button" id="audio-source-add" class="low-emphasis">Add</button>
+        <button type="button" data-modal-action="hide">Close</button>
     </div>
 </div></div>
 
@@ -2846,7 +2846,7 @@ <h1>Yomitan Settings</h1>
         </p>
     </div>
     <div class="modal-footer">
-        <button data-modal-action="hide">Close</button>
+        <button type="button" data-modal-action="hide">Close</button>
     </div>
 </div></div>
 
@@ -2865,7 +2865,7 @@ <h1>Yomitan Settings</h1>
         </p>
     </div>
     <div class="modal-footer">
-        <button data-modal-action="hide">Close</button>
+        <button type="button" data-modal-action="hide">Close</button>
     </div>
 </div></div>
 
@@ -2879,11 +2879,11 @@ <h1>Yomitan Settings</h1>
         </p>
         <div class="horizontal-flex margin-above">
             <input type="text" value="よみちゃん" id="text-to-speech-voice-test-text" autocomplete="off" lang="ja">
-            <button id="text-to-speech-voice-test">Test</button>
+            <button type="button" id="text-to-speech-voice-test">Test</button>
         </div>
     </div>
     <div class="modal-footer">
-        <button data-modal-action="hide">Close</button>
+        <button type="button" data-modal-action="hide">Close</button>
     </div>
 </div></div>
 
@@ -2910,12 +2910,12 @@ <h1>Yomitan Settings</h1>
             <select class="audio-source-parameter"></select>
         </div>
     </div>
-    <button class="icon-button audio-source-menu-button" data-menu="audio-source-menu" data-menu-position="below left"><span class="icon-button-inner"><span class="icon" data-icon="kebab-menu"></span></span></button>
+    <button type="button" class="icon-button audio-source-menu-button" data-menu="audio-source-menu" data-menu-position="below left"><span class="icon-button-inner"><span class="icon" data-icon="kebab-menu"></span></span></button>
 </div></template>
 
 <template id="audio-source-menu-template"><div class="popup-menu-container" tabindex="-1" role="dialog"><div class="popup-menu"><div class="popup-menu-body">
-    <button class="popup-menu-item" data-menu-action="help">Help</button>
-    <button class="popup-menu-item" data-menu-action="remove">Remove</button>
+    <button type="button" class="popup-menu-item" data-menu-action="help">Help</button>
+    <button type="button" class="popup-menu-item" data-menu-action="remove">Remove</button>
 </div></div></div></template>
 
 
@@ -2925,8 +2925,8 @@ <h1>Yomitan Settings</h1>
         <div class="modal-title">Scanning Inputs</div>
         <div class="modal-header-button-container">
             <div class="modal-header-button-group">
-                <button class="icon-button modal-header-button" data-modal-action="expand"><span class="icon-button-inner"><span class="icon" data-icon="expand"></span></span></button>
-                <button class="icon-button modal-header-button" data-modal-action="collapse"><span class="icon-button-inner"><span class="icon" data-icon="collapse"></span></span></button>
+                <button type="button" class="icon-button modal-header-button" data-modal-action="expand"><span class="icon-button-inner"><span class="icon" data-icon="expand"></span></span></button>
+                <button type="button" class="icon-button modal-header-button" data-modal-action="collapse"><span class="icon-button-inner"><span class="icon" data-icon="collapse"></span></span></button>
             </div>
         </div>
     </div>
@@ -2971,8 +2971,8 @@ <h1>Yomitan Settings</h1>
         </div>
     </div>
     <div class="modal-footer">
-        <button class="low-emphasis" id="scan-input-add">Add</button>
-        <button data-modal-action="hide">Close</button>
+        <button type="button" class="low-emphasis" id="scan-input-add">Add</button>
+        <button type="button" data-modal-action="hide">Close</button>
     </div>
 </div></div>
 
@@ -2983,20 +2983,20 @@ <h1>Yomitan Settings</h1>
         <div class="scan-input-index-cell generic-list-index-prefix"></div>
         <div class="scan-input-menu-button-cell">
             <div class="input-height-icon-button-container">
-                <button class="icon-button scanning-input-menu-button" data-menu="scanning-inputs-menu" data-menu-position="below left"><span class="icon-button-inner"><span class="icon" data-icon="kebab-menu"></span></span></button>
+                <button type="button" class="icon-button scanning-input-menu-button" data-menu="scanning-inputs-menu" data-menu-position="below left"><span class="icon-button-inner"><span class="icon" data-icon="kebab-menu"></span></span></button>
             </div>
         </div>
 
         <div class="scan-input-prefix-cell" data-property="include"><span>Required inputs:</span></div>
         <div class="scan-input-content-cell input-group" data-property="include">
             <input type="text" class="scan-input-field" autocomplete="off" spellcheck="false" placeholder="No inputs" data-property="include">
-            <button class="input-suffix input-suffix-icon-button light-icon mouse-button" data-property="include"><span class="icon" data-icon="mouse"></span></button>
+            <button type="button" class="input-suffix input-suffix-icon-button light-icon mouse-button" data-property="include"><span class="icon" data-icon="mouse"></span></button>
         </div>
 
         <div class="scan-input-prefix-cell" data-property="exclude"><span>Excluded inputs:</span></div>
         <div class="scan-input-content-cell input-group" data-property="exclude">
             <input type="text" class="scan-input-field" autocomplete="off" spellcheck="false" placeholder="No inputs" data-property="exclude">
-            <button class="input-suffix input-suffix-icon-button light-icon mouse-button" data-property="exclude"><span class="icon" data-icon="mouse"></span></button>
+            <button type="button" class="input-suffix input-suffix-icon-button light-icon mouse-button" data-property="exclude"><span class="icon" data-icon="mouse"></span></button>
         </div>
 
         <div class="scan-input-prefix-cell scan-input-options-cell" data-property="types"><span>Input types:</span></div>
@@ -3078,10 +3078,10 @@ <h1>Yomitan Settings</h1>
 </div></template>
 
 <template id="scanning-inputs-menu-template"><div class="popup-menu-container" tabindex="-1" role="dialog"><div class="popup-menu"><div class="popup-menu-body">
-    <button class="popup-menu-item" data-menu-action="showAdvanced">Show advanced options</button>
-    <button class="popup-menu-item" data-menu-action="hideAdvanced">Hide advanced options</button>
-    <button class="popup-menu-item" data-menu-action="clearInputs">Clear inputs</button>
-    <button class="popup-menu-item" data-menu-action="remove">Remove</button>
+    <button type="button" class="popup-menu-item" data-menu-action="showAdvanced">Show advanced options</button>
+    <button type="button" class="popup-menu-item" data-menu-action="hideAdvanced">Hide advanced options</button>
+    <button type="button" class="popup-menu-item" data-menu-action="clearInputs">Clear inputs</button>
+    <button type="button" class="popup-menu-item" data-menu-action="remove">Remove</button>
 </div></div></div></template>
 
 
@@ -3123,7 +3123,7 @@ <h1>Yomitan Settings</h1>
         </div>
     </div>
     <div class="modal-footer">
-        <button data-modal-action="hide">Close</button>
+        <button type="button" data-modal-action="hide">Close</button>
     </div>
 </div></div>
 
@@ -3134,8 +3134,8 @@ <h1>Yomitan Settings</h1>
         <div class="modal-title">Anki Cards</div>
         <div class="modal-header-button-container">
             <div class="modal-header-button-group">
-                <button class="icon-button modal-header-button" data-modal-action="expand"><span class="icon-button-inner"><span class="icon" data-icon="expand"></span></span></button>
-                <button class="icon-button modal-header-button" data-modal-action="collapse"><span class="icon-button-inner"><span class="icon" data-icon="collapse"></span></span></button>
+                <button type="button" class="icon-button modal-header-button" data-modal-action="expand"><span class="icon-button-inner"><span class="icon" data-icon="expand"></span></span></button>
+                <button type="button" class="icon-button modal-header-button" data-modal-action="collapse"><span class="icon-button-inner"><span class="icon" data-icon="collapse"></span></span></button>
             </div>
         </div>
     </div>
@@ -3152,7 +3152,7 @@ <h1>Yomitan Settings</h1>
                 </label>
             </div>
             <div class="tabs-right" hidden>
-                <button class="icon-button" data-menu-position="below left" id="anki-card-primary-type-menu-button"><span class="icon-button-inner"><span class="icon" data-icon="kebab-menu"></span></span></button>
+                <button type="button" class="icon-button" data-menu-position="below left" id="anki-card-primary-type-menu-button"><span class="icon-button-inner"><span class="icon" data-icon="kebab-menu"></span></span></button>
             </div>
         </div>
         <div class="modal-separator-line"></div>
@@ -3180,8 +3180,8 @@ <h1>Yomitan Settings</h1>
         </div>
     </div>
     <div class="modal-footer">
-        <button class="low-emphasis" data-modal-action="show,anki-cards-info">Help</button>
-        <button data-modal-action="hide">Close</button>
+        <button type="button" class="low-emphasis" data-modal-action="show,anki-cards-info">Help</button>
+        <button type="button" data-modal-action="hide">Close</button>
     </div>
 </div></div>
 
@@ -3190,8 +3190,8 @@ <h1>Yomitan Settings</h1>
         <div class="modal-title">Anki Card Information</div>
         <div class="modal-header-button-container">
             <div class="modal-header-button-group">
-                <button class="icon-button modal-header-button" data-modal-action="expand"><span class="icon-button-inner"><span class="icon" data-icon="expand"></span></span></button>
-                <button class="icon-button modal-header-button" data-modal-action="collapse"><span class="icon-button-inner"><span class="icon" data-icon="collapse"></span></span></button>
+                <button type="button" class="icon-button modal-header-button" data-modal-action="expand"><span class="icon-button-inner"><span class="icon" data-icon="expand"></span></span></button>
+                <button type="button" class="icon-button modal-header-button" data-modal-action="collapse"><span class="icon-button-inner"><span class="icon" data-icon="collapse"></span></span></button>
             </div>
         </div>
     </div>
@@ -3364,7 +3364,7 @@ <h1>Yomitan Settings</h1>
         </table>
     </div>
     <div class="modal-footer">
-        <button data-modal-action="hide">Close</button>
+        <button type="button" data-modal-action="hide">Close</button>
     </div>
 </div></div>
 
@@ -3373,7 +3373,7 @@ <h1>Yomitan Settings</h1>
 <template id="anki-card-field-template"><div class="anki-card-field-name-container"><span class="anki-card-field-name"></span></div>
 <div class="anki-card-field-value-container input-group">
     <input type="text" class="anki-card-field-value" autocomplete="off">
-    <button class="anki-card-field-value-menu-button input-suffix input-suffix-icon-button light-icon" data-menu-position="v-center left"><span class="icon" data-icon="material-down-arrow"></span></button>
+    <button type="button" class="anki-card-field-value-menu-button input-suffix input-suffix-icon-button light-icon" data-menu-position="v-center left"><span class="icon" data-icon="material-down-arrow"></span></button>
 </div></template>
 
 <template id="anki-card-terms-field-menu-template"><div class="popup-menu-container" tabindex="-1" role="dialog"><div class="popup-menu"><div class="popup-menu-body"></div></div></div></template>
@@ -3410,16 +3410,16 @@ <h1>Yomitan Settings</h1>
                 <input type="text" id="anki-card-templates-test-text-input" class="form-control" value="読め" placeholder="Preview text" autocomplete="off" lang="ja">
                 <div class="anki-card-templates-test-input-container input-group">
                     <input type="text" id="anki-card-templates-test-field-input" value="{expression}" placeholder="{marker}" autocomplete="off" spellcheck="false">
-                    <button class="input-suffix input-suffix-icon-button light-icon" id="anki-card-templates-test-field-menu-button" data-menu="anki-card-all-field-menu" data-menu-position="below left"><span class="icon" data-icon="material-down-arrow"></span></button>
+                    <button type="button" class="input-suffix input-suffix-icon-button light-icon" id="anki-card-templates-test-field-menu-button" data-menu="anki-card-all-field-menu" data-menu-position="below left"><span class="icon" data-icon="material-down-arrow"></span></button>
                 </div>
-                <button id="anki-card-templates-test-render-button">Test</button>
+                <button type="button" id="anki-card-templates-test-render-button">Test</button>
             </div>
         </div>
         <div class="code margin-above" id="anki-card-templates-render-result"><em>Card render result</em></div>
     </div>
     <div class="modal-footer">
-        <button class="danger" id="anki-card-templates-reset-button">Reset Templates</button>
-        <button data-modal-action="hide">Close</button>
+        <button type="button" class="danger" id="anki-card-templates-reset-button">Reset Templates</button>
+        <button type="button" data-modal-action="hide">Close</button>
     </div>
 </div></div>
 
@@ -3432,8 +3432,8 @@ <h1>Yomitan Settings</h1>
         </p>
     </div>
     <div class="modal-footer">
-        <button class="low-emphasis" data-modal-action="hide">Cancel</button>
-        <button class="danger" id="anki-card-templates-reset-button-confirm">Reset Templates</button>
+        <button type="button" class="low-emphasis" data-modal-action="hide">Cancel</button>
+        <button type="button" class="danger" id="anki-card-templates-reset-button-confirm">Reset Templates</button>
     </div>
 </div></div>
 
@@ -3447,7 +3447,7 @@ <h1>Yomitan Settings</h1>
         <p>Additional info can be found in the developer console.</p>
     </div>
     <div class="modal-footer">
-        <button class="low-emphasis" data-modal-action="hide">Close</button>
+        <button type="button" class="low-emphasis" data-modal-action="hide">Close</button>
     </div>
 </div></div>
 
@@ -3461,9 +3461,9 @@ <h1>Yomitan Settings</h1>
         <ul class="danger-text" id="settings-import-warning-message"></ul>
     </div>
     <div class="modal-footer">
-        <button class="low-emphasis" data-modal-action="hide">Cancel</button>
-        <button class="danger settings-import-warning-import-button">Import</button>
-        <button class="settings-import-warning-import-button" data-import-sanitize="true">Sanitize and Import</button>
+        <button type="button" class="low-emphasis" data-modal-action="hide">Cancel</button>
+        <button type="button" class="danger settings-import-warning-import-button">Import</button>
+        <button type="button" class="settings-import-warning-import-button" data-import-sanitize="true">Sanitize and Import</button>
     </div>
 </div></div>
 
@@ -3485,8 +3485,8 @@ <h1>Yomitan Settings</h1>
         </p>
     </div>
     <div class="modal-footer">
-        <button class="low-emphasis" data-modal-action="hide">Cancel</button>
-        <button class="danger" id="settings-reset-confirm-button">Reset All Settings</button>
+        <button type="button" class="low-emphasis" data-modal-action="hide">Cancel</button>
+        <button type="button" class="danger" id="settings-reset-confirm-button">Reset All Settings</button>
     </div>
 </div></div>
 
@@ -3497,8 +3497,8 @@ <h1>Yomitan Settings</h1>
         <div class="modal-title">Custom Text Replacement Patterns</div>
         <div class="modal-header-button-container">
             <div class="modal-header-button-group">
-                <button class="icon-button modal-header-button" data-modal-action="expand"><span class="icon-button-inner"><span class="icon" data-icon="expand"></span></span></button>
-                <button class="icon-button modal-header-button" data-modal-action="collapse"><span class="icon-button-inner"><span class="icon" data-icon="collapse"></span></span></button>
+                <button type="button" class="icon-button modal-header-button" data-modal-action="expand"><span class="icon-button-inner"><span class="icon" data-icon="expand"></span></span></button>
+                <button type="button" class="icon-button modal-header-button" data-modal-action="collapse"><span class="icon-button-inner"><span class="icon" data-icon="collapse"></span></span></button>
             </div>
         </div>
     </div>
@@ -3536,8 +3536,8 @@ <h1>Yomitan Settings</h1>
         </div>
     </div>
     <div class="modal-footer">
-        <button id="translation-text-replacement-add" class="low-emphasis">Add</button>
-        <button data-modal-action="hide">Close</button>
+        <button type="button" id="translation-text-replacement-add" class="low-emphasis">Add</button>
+        <button type="button" data-modal-action="hide">Close</button>
     </div>
 </div></div>
 
@@ -3557,7 +3557,7 @@ <h1>Yomitan Settings</h1>
     <div class="translation-text-replacement-replacement-container">
         <input type="text" class="translation-text-replacement-replacement code">
     </div>
-    <button class="icon-button translation-text-replacement-button" data-menu="translation-text-replacement-entry-menu" data-menu-position="below left"><span class="icon-button-inner"><span class="icon" data-icon="kebab-menu"></span></span></button>
+    <button type="button" class="icon-button translation-text-replacement-button" data-menu="translation-text-replacement-entry-menu" data-menu-position="below left"><span class="icon-button-inner"><span class="icon" data-icon="kebab-menu"></span></span></button>
 
     <div class="translation-text-replacement-test-label translation-text-replacement-test-node">Test Input:</div>
     <div class="translation-text-replacement-test-container translation-text-replacement-test-node">
@@ -3568,9 +3568,9 @@ <h1>Yomitan Settings</h1>
 </div></template>
 
 <template id="translation-text-replacement-entry-menu-template"><div class="popup-menu-container" tabindex="-1" role="dialog"><div class="popup-menu"><div class="popup-menu-body">
-    <button class="popup-menu-item" data-menu-action="showTest">Test</button>
-    <button class="popup-menu-item" data-menu-action="hideTest">Hide test</button>
-    <button class="popup-menu-item" data-menu-action="remove">Remove</button>
+    <button type="button" class="popup-menu-item" data-menu-action="showTest">Test</button>
+    <button type="button" class="popup-menu-item" data-menu-action="hideTest">Hide test</button>
+    <button type="button" class="popup-menu-item" data-menu-action="remove">Remove</button>
 </div></div></div></template>
 
 
@@ -3580,8 +3580,8 @@ <h1>Yomitan Settings</h1>
         <div class="modal-title">Sentence Termination Characters</div>
         <div class="modal-header-button-container">
             <div class="modal-header-button-group">
-                <button class="icon-button modal-header-button" data-modal-action="expand"><span class="icon-button-inner"><span class="icon" data-icon="expand"></span></span></button>
-                <button class="icon-button modal-header-button" data-modal-action="collapse"><span class="icon-button-inner"><span class="icon" data-icon="collapse"></span></span></button>
+                <button type="button" class="icon-button modal-header-button" data-modal-action="expand"><span class="icon-button-inner"><span class="icon" data-icon="expand"></span></span></button>
+                <button type="button" class="icon-button modal-header-button" data-modal-action="collapse"><span class="icon-button-inner"><span class="icon" data-icon="collapse"></span></span></button>
             </div>
         </div>
     </div>
@@ -3606,9 +3606,9 @@ <h1>Yomitan Settings</h1>
         </div>
     </div>
     <div class="modal-footer">
-        <button class="low-emphasis danger" id="sentence-termination-character-list-reset">Reset</button>
-        <button class="low-emphasis" id="sentence-termination-character-list-add">Add</button>
-        <button data-modal-action="hide">Close</button>
+        <button type="button" class="low-emphasis danger" id="sentence-termination-character-list-reset">Reset</button>
+        <button type="button" class="low-emphasis" id="sentence-termination-character-list-add">Add</button>
+        <button type="button" data-modal-action="hide">Close</button>
     </div>
 </div></div>
 
@@ -3645,12 +3645,12 @@ <h1>Yomitan Settings</h1>
         </div>
     </td>
     <td>
-        <button class="icon-button sentence-termination-character-entry-button" data-menu="sentence-termination-character-entry-menu" data-menu-position="below left"><span class="icon-button-inner"><span class="icon" data-icon="kebab-menu"></span></span></button>
+        <button type="button" class="icon-button sentence-termination-character-entry-button" data-menu="sentence-termination-character-entry-menu" data-menu-position="below left"><span class="icon-button-inner"><span class="icon" data-icon="kebab-menu"></span></span></button>
     </td>
 </tr></template>
 
 <template id="sentence-termination-character-entry-menu-template"><div class="popup-menu-container" tabindex="-1" role="dialog"><div class="popup-menu"><div class="popup-menu-body">
-    <button class="popup-menu-item" data-menu-action="delete">Delete</button>
+    <button type="button" class="popup-menu-item" data-menu-action="delete">Delete</button>
 </div></div></div></template>
 
 
@@ -3660,8 +3660,8 @@ <h1>Yomitan Settings</h1>
         <div class="modal-title">Keyboard Shortcuts</div>
         <div class="modal-header-button-container">
             <div class="modal-header-button-group">
-                <button class="icon-button modal-header-button" data-modal-action="expand"><span class="icon-button-inner"><span class="icon" data-icon="expand"></span></span></button>
-                <button class="icon-button modal-header-button" data-modal-action="collapse"><span class="icon-button-inner"><span class="icon" data-icon="collapse"></span></span></button>
+                <button type="button" class="icon-button modal-header-button" data-modal-action="expand"><span class="icon-button-inner"><span class="icon" data-icon="expand"></span></span></button>
+                <button type="button" class="icon-button modal-header-button" data-modal-action="collapse"><span class="icon-button-inner"><span class="icon" data-icon="collapse"></span></span></button>
             </div>
         </div>
     </div>
@@ -3672,9 +3672,9 @@ <h1>Yomitan Settings</h1>
         </div>
     </div>
     <div class="modal-footer">
-        <button class="low-emphasis danger" data-modal-action="show,keyboard-shortcuts-reset">Reset</button>
-        <button class="low-emphasis" id="hotkey-list-add">Add</button>
-        <button data-modal-action="hide">Close</button>
+        <button type="button" class="low-emphasis danger" data-modal-action="show,keyboard-shortcuts-reset">Reset</button>
+        <button type="button" class="low-emphasis" id="hotkey-list-add">Add</button>
+        <button type="button" data-modal-action="hide">Close</button>
     </div>
 </div></div>
 
@@ -3683,8 +3683,8 @@ <h1>Yomitan Settings</h1>
         <div class="modal-title">Native Keyboard Shortcuts</div>
         <div class="modal-header-button-container">
             <div class="modal-header-button-group">
-                <button class="icon-button modal-header-button" data-modal-action="expand"><span class="icon-button-inner"><span class="icon" data-icon="expand"></span></span></button>
-                <button class="icon-button modal-header-button" data-modal-action="collapse"><span class="icon-button-inner"><span class="icon" data-icon="collapse"></span></span></button>
+                <button type="button" class="icon-button modal-header-button" data-modal-action="expand"><span class="icon-button-inner"><span class="icon" data-icon="expand"></span></span></button>
+                <button type="button" class="icon-button modal-header-button" data-modal-action="collapse"><span class="icon-button-inner"><span class="icon" data-icon="collapse"></span></span></button>
             </div>
         </div>
     </div>
@@ -3721,9 +3721,9 @@ <h1>Yomitan Settings</h1>
         <div class="modal-settings-group" id="extension-hotkey-list"></div>
     </div>
     <div class="modal-footer">
-        <button class="low-emphasis danger" id="extension-hotkey-list-reset-all">Reset All</button>
-        <button class="low-emphasis danger" id="extension-hotkey-list-clear-all">Clear All</button>
-        <button data-modal-action="hide">Close</button>
+        <button type="button" class="low-emphasis danger" id="extension-hotkey-list-reset-all">Reset All</button>
+        <button type="button" class="low-emphasis danger" id="extension-hotkey-list-clear-all">Clear All</button>
+        <button type="button" data-modal-action="hide">Close</button>
     </div>
 </div></div>
 
@@ -3733,8 +3733,8 @@ <h1>Yomitan Settings</h1>
         Are you sure you want to reset all keyboard shortcuts to their defaults?
     </div>
     <div class="modal-footer">
-        <button class="low-emphasis" data-modal-action="hide">Cancel</button>
-        <button class="danger" id="hotkey-list-reset" data-modal-action="hide">Reset All</button>
+        <button type="button" class="low-emphasis" data-modal-action="hide">Cancel</button>
+        <button type="button" class="danger" id="hotkey-list-reset" data-modal-action="hide">Reset All</button>
     </div>
 </div></div>
 
@@ -3743,7 +3743,7 @@ <h1>Yomitan Settings</h1>
     <div class="hotkey-list-item-index-cell generic-list-index-prefix"></div>
     <div class="hotkey-list-item-button-cell">
         <div class="input-height-icon-button-container">
-            <button class="icon-button hotkey-list-item-button" data-menu="hotkey-list-item-menu" data-menu-position="below left"><span class="icon-button-inner"><span class="icon" data-icon="kebab-menu"></span></span></button>
+            <button type="button" class="icon-button hotkey-list-item-button" data-menu="hotkey-list-item-menu" data-menu-position="below left"><span class="icon-button-inner"><span class="icon" data-icon="kebab-menu"></span></span></button>
         </div>
     </div>
 
@@ -3751,13 +3751,13 @@ <h1>Yomitan Settings</h1>
     <div class="hotkey-list-item-input-cell">
         <input type="text" class="hotkey-list-item-input" autocomplete="off" spellcheck="false" placeholder="No input" data-property="include">
         <div class="hotkey-list-item-enabled-button-container input-group">
-            <button class="hotkey-list-item-enabled-button input-button">
+            <button type="button" class="hotkey-list-item-enabled-button input-button">
                 <label class="hotkey-list-item-enabled-button-label button-inner-label">
                     <span class="checkbox"><input type="checkbox" class="hotkey-list-item-enabled"><span class="checkbox-body"><span class="checkbox-fill"></span><span class="checkbox-border"></span><span class="checkbox-check"></span></span></span>
                     <span>Enabled</span>
                 </label>
             </button>
-            <button class="hotkey-list-item-scopes-button input-suffix input-suffix-icon-button light-icon" data-menu="hotkey-list-item-scopes-menu" data-menu-position="below left"><span class="icon" data-icon="material-down-arrow"></span></button>
+            <button type="button" class="hotkey-list-item-scopes-button input-suffix input-suffix-icon-button light-icon" data-menu="hotkey-list-item-scopes-menu" data-menu-position="below left"><span class="icon" data-icon="material-down-arrow"></span></button>
         </div>
     </div>
 
@@ -3797,36 +3797,36 @@ <h1>Yomitan Settings</h1>
     <div class="settings-item-right">
         <div class="flex-row-nowrap">
             <input type="text">
-            <button class="icon-button extension-hotkey-list-item-button" data-menu="extension-hotkey-list-item-menu" data-menu-position="below left"><span class="icon-button-inner"><span class="icon" data-icon="kebab-menu"></span></span></button>
+            <button type="button" class="icon-button extension-hotkey-list-item-button" data-menu="extension-hotkey-list-item-menu" data-menu-position="below left"><span class="icon-button-inner"><span class="icon" data-icon="kebab-menu"></span></span></button>
         </div>
     </div>
 </div></div></template>
 
 <template id="hotkey-list-item-menu-template"><div class="popup-menu-container" tabindex="-1" role="dialog"><div class="popup-menu"><div class="popup-menu-body">
-    <button class="popup-menu-item" data-menu-action="clearInputs">Clear input</button>
-    <button class="popup-menu-item" data-menu-action="resetInput">Reset input</button>
-    <button class="popup-menu-item" data-menu-action="resetArgument">Reset argument</button>
-    <button class="popup-menu-item" data-menu-action="delete">Delete</button>
+    <button type="button" class="popup-menu-item" data-menu-action="clearInputs">Clear input</button>
+    <button type="button" class="popup-menu-item" data-menu-action="resetInput">Reset input</button>
+    <button type="button" class="popup-menu-item" data-menu-action="resetArgument">Reset argument</button>
+    <button type="button" class="popup-menu-item" data-menu-action="delete">Delete</button>
 </div></div></div></template>
 
 <template id="hotkey-list-item-scopes-menu-template"><div class="popup-menu-container" tabindex="-1" role="dialog"><div class="popup-menu"><div class="popup-menu-body">
-    <button class="popup-menu-item hotkey-scope-popup-menu-item" data-menu-action="toggleScope" data-scope="web"><label class="hotkey-scope-popup-menu-item-label button-inner-label">
+    <button type="button" class="popup-menu-item hotkey-scope-popup-menu-item" data-menu-action="toggleScope" data-scope="web"><label class="hotkey-scope-popup-menu-item-label button-inner-label">
         <label class="checkbox"><input type="checkbox" class="hotkey-scope-checkbox" data-scope="web"><span class="checkbox-body"><span class="checkbox-fill"></span><span class="checkbox-border"></span><span class="checkbox-check"></span></span></label>
         <span>Web</span>
     </label></button>
-    <button class="popup-menu-item hotkey-scope-popup-menu-item" data-menu-action="toggleScope" data-scope="popup"><label class="hotkey-scope-popup-menu-item-label button-inner-label">
+    <button type="button" class="popup-menu-item hotkey-scope-popup-menu-item" data-menu-action="toggleScope" data-scope="popup"><label class="hotkey-scope-popup-menu-item-label button-inner-label">
         <label class="checkbox"><input type="checkbox" class="hotkey-scope-checkbox" data-scope="popup"><span class="checkbox-body"><span class="checkbox-fill"></span><span class="checkbox-border"></span><span class="checkbox-check"></span></span></label>
         <span>Popup</span>
     </label></button>
-    <button class="popup-menu-item hotkey-scope-popup-menu-item" data-menu-action="toggleScope" data-scope="search"><label class="hotkey-scope-popup-menu-item-label button-inner-label">
+    <button type="button" class="popup-menu-item hotkey-scope-popup-menu-item" data-menu-action="toggleScope" data-scope="search"><label class="hotkey-scope-popup-menu-item-label button-inner-label">
         <label class="checkbox"><input type="checkbox" class="hotkey-scope-checkbox" data-scope="search"><span class="checkbox-body"><span class="checkbox-fill"></span><span class="checkbox-border"></span><span class="checkbox-check"></span></span></label>
         <span>Search</span>
     </label></button>
 </div></div></div></template>
 
 <template id="extension-hotkey-list-item-menu-template"><div class="popup-menu-container" tabindex="-1" role="dialog"><div class="popup-menu"><div class="popup-menu-body">
-    <button class="popup-menu-item" data-menu-action="clearInput">Clear input</button>
-    <button class="popup-menu-item" data-menu-action="resetInput">Reset input</button>
+    <button type="button" class="popup-menu-item" data-menu-action="clearInput">Clear input</button>
+    <button type="button" class="popup-menu-item" data-menu-action="resetInput">Reset input</button>
 </div></div></div></template>
 
 <template id="hotkey-argument-move-offset-template"><div class="flex-row-nowrap">
diff --git a/ext/welcome.html b/ext/welcome.html
index 8a01d06f3f..14e9836737 100644
--- a/ext/welcome.html
+++ b/ext/welcome.html
@@ -60,7 +60,7 @@ <h2>Here are some basics to get started</h2>
                         <div class="settings-item-label">Install or remove dictionaries&hellip;</div>
                     </div>
                     <div class="settings-item-right open-panel-button-container">
-                        <button class="icon-button"><span class="icon-button-inner"><span class="icon" data-icon="material-right-arrow"></span></span></button>
+                        <button type="button" class="icon-button"><span class="icon-button-inner"><span class="icon" data-icon="material-right-arrow"></span></span></button>
                     </div>
                 </div></div>
             </div>
@@ -195,7 +195,7 @@ <h2>Basic customization</h2>
                 <div class="settings-item-label">More customization options are available on the Settings page</div>
             </div>
             <div class="settings-item-right open-panel-button-container">
-                <button class="icon-button"><span class="icon-button-inner"><span class="icon" data-icon="material-right-arrow"></span></span></button>
+                <button type="button" class="icon-button"><span class="icon-button-inner"><span class="icon" data-icon="material-right-arrow"></span></span></button>
             </div>
         </div></a>
     </div>
@@ -231,8 +231,8 @@ <h2>Basic customization</h2>
         <div class="modal-title">Dictionaries</div>
         <div class="modal-header-button-container">
             <div class="modal-header-button-group">
-                <button class="icon-button modal-header-button" data-modal-action="expand"><span class="icon-button-inner"><span class="icon" data-icon="expand"></span></span></button>
-                <button class="icon-button modal-header-button" data-modal-action="collapse"><span class="icon-button-inner"><span class="icon" data-icon="collapse"></span></span></button>
+                <button type="button" class="icon-button modal-header-button" data-modal-action="expand"><span class="icon-button-inner"><span class="icon" data-icon="expand"></span></span></button>
+                <button type="button" class="icon-button modal-header-button" data-modal-action="collapse"><span class="icon-button-inner"><span class="icon" data-icon="collapse"></span></span></button>
             </div>
         </div>
     </div>
@@ -290,9 +290,9 @@ <h2>Basic customization</h2>
         <div class="progress-bar-track"><div class="progress-bar"></div></div>
     </div>
     <div class="modal-footer">
-        <button class="low-emphasis danger dictionary-database-mutating-input" id="dictionary-delete-all-button">Delete All</button>
-        <button class="low-emphasis dictionary-database-mutating-input" id="dictionary-import-file-button">Import</button>
-        <button data-modal-action="hide">Close</button>
+        <button type="button" class="low-emphasis danger dictionary-database-mutating-input" id="dictionary-delete-all-button">Delete All</button>
+        <button type="button" class="low-emphasis dictionary-database-mutating-input" id="dictionary-import-file-button">Import</button>
+        <button type="button" data-modal-action="hide">Close</button>
     </div>
 </div></div>
 
@@ -304,8 +304,8 @@ <h2>Basic customization</h2>
         <p class="danger-text">This action cannot be undone.</p>
     </div>
     <div class="modal-footer">
-        <button class="low-emphasis" data-modal-action="hide">Cancel</button>
-        <button class="danger" data-modal-action="hide" id="dictionary-confirm-delete-button">Delete</button>
+        <button type="button" class="low-emphasis" data-modal-action="hide">Cancel</button>
+        <button type="button" class="danger" data-modal-action="hide" id="dictionary-confirm-delete-button">Delete</button>
     </div>
 </div></div>
 
@@ -316,8 +316,8 @@ <h2>Basic customization</h2>
         <p class="danger-text">This action cannot be undone.</p>
     </div>
     <div class="modal-footer">
-        <button class="low-emphasis" data-modal-action="hide">Cancel</button>
-        <button class="danger" data-modal-action="hide" id="dictionary-confirm-delete-all-button">Delete</button>
+        <button type="button" class="low-emphasis" data-modal-action="hide">Cancel</button>
+        <button type="button" class="danger" data-modal-action="hide" id="dictionary-confirm-delete-all-button">Delete</button>
     </div>
 </div></div>
 
@@ -355,7 +355,7 @@ <h2>Basic customization</h2>
         </div></div>
     </div>
     <div class="modal-footer">
-        <button data-modal-action="hide">Close</button>
+        <button type="button" data-modal-action="hide">Close</button>
     </div>
 </div></div>
 
@@ -368,8 +368,8 @@ <h2>Basic customization</h2>
         </div>
     </div>
     <div class="modal-footer">
-        <button class="low-emphasis" data-modal-action="hide">Cancel</button>
-        <button data-modal-action="hide" id="dictionary-move-button">Move</button>
+        <button type="button" class="low-emphasis" data-modal-action="hide">Cancel</button>
+        <button type="button" data-modal-action="hide" id="dictionary-move-button">Move</button>
     </div>
 </div></div>
 
@@ -382,15 +382,15 @@ <h2>Basic customization</h2>
         <span>
             <strong class="dictionary-title"></strong> <span class="light dictionary-version"></span>
         </span>
-        <button class="dictionary-outdated-button" hidden>
+        <button type="button" class="dictionary-outdated-button" hidden>
             <div class="badge warning-badge"><span class="icon" data-icon="exclamation-point-short"></span></div>
         </button>
-        <button class="dictionary-integrity-button" hidden>
+        <button type="button" class="dictionary-integrity-button" hidden>
             <div class="badge info-badge badge-small-icon"><span class="icon" data-icon="checkmark"></span></div>
         </button>
     </div>
     <input type="number" step="1" class="short-height dictionary-priority">
-    <button class="icon-button dictionary-menu-button" data-menu="dictionary-menu" data-menu-position="below left"><span class="icon-button-inner"><span class="icon" data-icon="kebab-menu"></span></span></button>
+    <button type="button" class="icon-button dictionary-menu-button" data-menu="dictionary-menu" data-menu-position="below left"><span class="icon-button-inner"><span class="icon" data-icon="kebab-menu"></span></span></button>
 </template>
 
 <template id="dictionary-details-entry-template"><div class="dictionary-details-entry">
@@ -399,11 +399,11 @@ <h2>Basic customization</h2>
 </div></template>
 
 <template id="dictionary-menu-template"><div class="popup-menu-container" tabindex="-1" role="dialog"><div class="popup-menu"><div class="popup-menu-body">
-    <button class="popup-menu-item" data-menu-action="showDetails">Details&hellip;</button>
-    <button class="popup-menu-item" data-menu-action="moveUp">Move up</button>
-    <button class="popup-menu-item" data-menu-action="moveDown">Move down</button>
-    <button class="popup-menu-item" data-menu-action="moveTo">Move to&hellip;</button>
-    <button class="popup-menu-item" data-menu-action="delete">Delete</button>
+    <button type="button" class="popup-menu-item" data-menu-action="showDetails">Details&hellip;</button>
+    <button type="button" class="popup-menu-item" data-menu-action="moveUp">Move up</button>
+    <button type="button" class="popup-menu-item" data-menu-action="moveDown">Move down</button>
+    <button type="button" class="popup-menu-item" data-menu-action="moveTo">Move to&hellip;</button>
+    <button type="button" class="popup-menu-item" data-menu-action="delete">Delete</button>
 </div></div></div></template>
 
 
diff --git a/package-lock.json b/package-lock.json
index cce1991f54..67b52ff43e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20,7 +20,7 @@
                 "eslint-plugin-jsonc": "^2.9.0",
                 "eslint-plugin-no-unsanitized": "^4.0.1",
                 "fake-indexeddb": "^4.0.2",
-                "html-validate": "^7.6.0",
+                "html-validate": "^8.5.0",
                 "jsdom": "^22.1.0",
                 "parse5": "^7.1.2",
                 "stylelint": "^15.10.3",
@@ -383,15 +383,15 @@
             }
         },
         "node_modules/@html-validate/stylish": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/@html-validate/stylish/-/stylish-3.0.1.tgz",
-            "integrity": "sha512-jQNDrSnWvJEPSlqC1tFqcbmVuJy2x61UwqFsXHxYT2sgCXFW4AVhsoIcHkECCmUHtQ8hpHU6yOBGA+rMLZhS7A==",
+            "version": "4.2.0",
+            "resolved": "https://registry.npmjs.org/@html-validate/stylish/-/stylish-4.2.0.tgz",
+            "integrity": "sha512-Nl8HCv0hGRSLQ+n1OD4Hk3a+Urwk9HH0vQkAzzCarT4KlA7bRl+6xEiS5PZVwOmjtC7XiH/oNe3as9Fxcr2A1w==",
             "dev": true,
             "dependencies": {
                 "kleur": "^4.0.0"
             },
             "engines": {
-                "node": ">= 14.0"
+                "node": ">= 16"
             }
         },
         "node_modules/@humanwhocodes/config-array": {
@@ -744,15 +744,6 @@
                 "node": ">=0.4.0"
             }
         },
-        "node_modules/acorn-walk": {
-            "version": "8.2.0",
-            "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
-            "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.4.0"
-            }
-        },
         "node_modules/addons-linter": {
             "version": "6.13.0",
             "resolved": "https://registry.npmjs.org/addons-linter/-/addons-linter-6.13.0.tgz",
@@ -4204,19 +4195,17 @@
             }
         },
         "node_modules/html-validate": {
-            "version": "7.6.0",
-            "resolved": "https://registry.npmjs.org/html-validate/-/html-validate-7.6.0.tgz",
-            "integrity": "sha512-6Ib433N0/ou2/0oLjfUmFjaAVFW8KKU/fOBBhrZXNuPcYCUsZExAD3xOqKl1bp5ANHb4PItXEK9vcKL/L7Da0Q==",
+            "version": "8.5.0",
+            "resolved": "https://registry.npmjs.org/html-validate/-/html-validate-8.5.0.tgz",
+            "integrity": "sha512-EiRJ7mqRZb68DgxyMlA+5uVheCuNYZiXnoSajcdSTK8IcNuPpyeSI0CZu9wK1jE6jQrWnf8myIa5JkjDByHPuw==",
             "dev": true,
             "dependencies": {
                 "@babel/code-frame": "^7.10.0",
-                "@html-validate/stylish": "^3.0.0",
+                "@html-validate/stylish": "^4.1.0",
                 "@sidvind/better-ajv-errors": "^2.0.0",
-                "acorn-walk": "^8.0.0",
                 "ajv": "^8.0.0",
                 "deepmerge": "^4.2.0",
-                "espree": "^9.0.0",
-                "glob": "^8.0.0",
+                "glob": "^10.0.0",
                 "ignore": "^5.0.0",
                 "kleur": "^4.1.0",
                 "minimist": "^1.2.0",
@@ -4227,12 +4216,13 @@
                 "html-validate": "bin/html-validate.js"
             },
             "engines": {
-                "node": ">= 14.0"
+                "node": ">= 16.0"
             },
             "peerDependencies": {
-                "jest": "^25.1 || ^26 || ^27.1 || ^28.1.3 || ^29.0.3",
-                "jest-diff": "^25.1 || ^26 || ^27.1 || ^28.1.3 || ^29.0.3",
-                "jest-snapshot": "^25.1 || ^26 || ^27.1 || ^28.1.3 || ^29.0.3"
+                "jest": "^27.1 || ^28.1.3 || ^29.0.3",
+                "jest-diff": "^27.1 || ^28.1.3 || ^29.0.3",
+                "jest-snapshot": "^27.1 || ^28.1.3 || ^29.0.3",
+                "vitest": "^0.34"
             },
             "peerDependenciesMeta": {
                 "jest": {
@@ -4243,6 +4233,9 @@
                 },
                 "jest-snapshot": {
                     "optional": true
+                },
+                "vitest": {
+                    "optional": true
                 }
             }
         },
@@ -4256,34 +4249,40 @@
             }
         },
         "node_modules/html-validate/node_modules/glob": {
-            "version": "8.0.3",
-            "resolved": "https://registry.npmjs.org/glob/-/glob-8.0.3.tgz",
-            "integrity": "sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==",
+            "version": "10.3.10",
+            "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz",
+            "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==",
             "dev": true,
             "dependencies": {
-                "fs.realpath": "^1.0.0",
-                "inflight": "^1.0.4",
-                "inherits": "2",
-                "minimatch": "^5.0.1",
-                "once": "^1.3.0"
+                "foreground-child": "^3.1.0",
+                "jackspeak": "^2.3.5",
+                "minimatch": "^9.0.1",
+                "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0",
+                "path-scurry": "^1.10.1"
+            },
+            "bin": {
+                "glob": "dist/esm/bin.mjs"
             },
             "engines": {
-                "node": ">=12"
+                "node": ">=16 || 14 >=14.17"
             },
             "funding": {
                 "url": "https://github.com/sponsors/isaacs"
             }
         },
         "node_modules/html-validate/node_modules/minimatch": {
-            "version": "5.1.0",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz",
-            "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==",
+            "version": "9.0.3",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
+            "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
             "dev": true,
             "dependencies": {
                 "brace-expansion": "^2.0.1"
             },
             "engines": {
-                "node": ">=10"
+                "node": ">=16 || 14 >=14.17"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
             }
         },
         "node_modules/htmlescape": {
@@ -5017,9 +5016,9 @@
             "dev": true
         },
         "node_modules/jackspeak": {
-            "version": "2.3.3",
-            "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.3.tgz",
-            "integrity": "sha512-R2bUw+kVZFS/h1AZqBKrSgDmdmjApzgY0AlCPumopFiAlbUxE2gf+SCuBzQ0cP5hHmUmFYF5yw55T97Th5Kstg==",
+            "version": "2.3.6",
+            "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz",
+            "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==",
             "dev": true,
             "dependencies": {
                 "@isaacs/cliui": "^8.0.2"
@@ -9628,9 +9627,9 @@
             "dev": true
         },
         "@html-validate/stylish": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/@html-validate/stylish/-/stylish-3.0.1.tgz",
-            "integrity": "sha512-jQNDrSnWvJEPSlqC1tFqcbmVuJy2x61UwqFsXHxYT2sgCXFW4AVhsoIcHkECCmUHtQ8hpHU6yOBGA+rMLZhS7A==",
+            "version": "4.2.0",
+            "resolved": "https://registry.npmjs.org/@html-validate/stylish/-/stylish-4.2.0.tgz",
+            "integrity": "sha512-Nl8HCv0hGRSLQ+n1OD4Hk3a+Urwk9HH0vQkAzzCarT4KlA7bRl+6xEiS5PZVwOmjtC7XiH/oNe3as9Fxcr2A1w==",
             "dev": true,
             "requires": {
                 "kleur": "^4.0.0"
@@ -9897,12 +9896,6 @@
                 }
             }
         },
-        "acorn-walk": {
-            "version": "8.2.0",
-            "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
-            "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
-            "dev": true
-        },
         "addons-linter": {
             "version": "6.13.0",
             "resolved": "https://registry.npmjs.org/addons-linter/-/addons-linter-6.13.0.tgz",
@@ -12569,19 +12562,17 @@
             "dev": true
         },
         "html-validate": {
-            "version": "7.6.0",
-            "resolved": "https://registry.npmjs.org/html-validate/-/html-validate-7.6.0.tgz",
-            "integrity": "sha512-6Ib433N0/ou2/0oLjfUmFjaAVFW8KKU/fOBBhrZXNuPcYCUsZExAD3xOqKl1bp5ANHb4PItXEK9vcKL/L7Da0Q==",
+            "version": "8.5.0",
+            "resolved": "https://registry.npmjs.org/html-validate/-/html-validate-8.5.0.tgz",
+            "integrity": "sha512-EiRJ7mqRZb68DgxyMlA+5uVheCuNYZiXnoSajcdSTK8IcNuPpyeSI0CZu9wK1jE6jQrWnf8myIa5JkjDByHPuw==",
             "dev": true,
             "requires": {
                 "@babel/code-frame": "^7.10.0",
-                "@html-validate/stylish": "^3.0.0",
+                "@html-validate/stylish": "^4.1.0",
                 "@sidvind/better-ajv-errors": "^2.0.0",
-                "acorn-walk": "^8.0.0",
                 "ajv": "^8.0.0",
                 "deepmerge": "^4.2.0",
-                "espree": "^9.0.0",
-                "glob": "^8.0.0",
+                "glob": "^10.0.0",
                 "ignore": "^5.0.0",
                 "kleur": "^4.1.0",
                 "minimist": "^1.2.0",
@@ -12599,22 +12590,22 @@
                     }
                 },
                 "glob": {
-                    "version": "8.0.3",
-                    "resolved": "https://registry.npmjs.org/glob/-/glob-8.0.3.tgz",
-                    "integrity": "sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==",
+                    "version": "10.3.10",
+                    "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz",
+                    "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==",
                     "dev": true,
                     "requires": {
-                        "fs.realpath": "^1.0.0",
-                        "inflight": "^1.0.4",
-                        "inherits": "2",
-                        "minimatch": "^5.0.1",
-                        "once": "^1.3.0"
+                        "foreground-child": "^3.1.0",
+                        "jackspeak": "^2.3.5",
+                        "minimatch": "^9.0.1",
+                        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0",
+                        "path-scurry": "^1.10.1"
                     }
                 },
                 "minimatch": {
-                    "version": "5.1.0",
-                    "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz",
-                    "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==",
+                    "version": "9.0.3",
+                    "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
+                    "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
                     "dev": true,
                     "requires": {
                         "brace-expansion": "^2.0.1"
@@ -13130,9 +13121,9 @@
             "dev": true
         },
         "jackspeak": {
-            "version": "2.3.3",
-            "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.3.tgz",
-            "integrity": "sha512-R2bUw+kVZFS/h1AZqBKrSgDmdmjApzgY0AlCPumopFiAlbUxE2gf+SCuBzQ0cP5hHmUmFYF5yw55T97Th5Kstg==",
+            "version": "2.3.6",
+            "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz",
+            "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==",
             "dev": true,
             "requires": {
                 "@isaacs/cliui": "^8.0.2",
diff --git a/package.json b/package.json
index f1c39bf5bb..199505292b 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
         "eslint-plugin-jsonc": "^2.9.0",
         "eslint-plugin-no-unsanitized": "^4.0.1",
         "fake-indexeddb": "^4.0.2",
-        "html-validate": "^7.6.0",
+        "html-validate": "^8.5.0",
         "jsdom": "^22.1.0",
         "parse5": "^7.1.2",
         "stylelint": "^15.10.3",
diff --git a/test/data/html/test-document1.html b/test/data/html/test-document1.html
index 78d862c465..04e930da00 100644
--- a/test/data/html/test-document1.html
+++ b/test/data/html/test-document1.html
@@ -138,7 +138,7 @@ <h1>Yomichan Tests</h1>
         data-sentence-scan-extent="100"
         data-sentence="よみちゃん"
     >
-        <button style="width: 100%; box-sizing: border-box; font-family: inherit; font-size: inherit; border: 1px solid #d8d8d8; background-color: #f0f0f0; padding: 0.2em;">よみちゃん</button>
+        <button type="button" style="width: 100%; box-sizing: border-box; font-family: inherit; font-size: inherit; border: 1px solid #d8d8d8; background-color: #f0f0f0; padding: 0.2em;">よみちゃん</button>
     </div>
 
     <div
diff --git a/test/data/html/test-dom-text-scanner.html b/test/data/html/test-dom-text-scanner.html
index 9a9ea95de2..c7ae2a3714 100644
--- a/test/data/html/test-dom-text-scanner.html
+++ b/test/data/html/test-dom-text-scanner.html
@@ -290,7 +290,7 @@ <h1>Yomichan DOMTextScanner Tests</h1>
         }'
     >
         <y-description>Skip &lt;button&gt; content.</y-description>
-<div>小ぢん<button>content</button>まり1</div>
+<div>小ぢん<button type="button">content</button>まり1</div>
     </y-test>
 
     <y-test