From c1d5b4614529ec03f5b2cb80e3471b5c4c83966b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BE=9D=E7=91=AA=E8=B2=93?= <imacat@mail.imacat.idv.tw>
Date: Tue, 14 Apr 2026 07:02:17 +0800
Subject: [PATCH] Add ARIA markup to icons, icon-only buttons, and pagination
 dropdown

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .../templates/accounting/account/detail.html   | 14 +++++++-------
 .../accounting/account/include/form.html       | 10 +++++-----
 .../templates/accounting/account/list.html     |  8 ++++----
 .../templates/accounting/account/order.html    | 10 +++++-----
 .../accounting/base-account/detail.html        |  2 +-
 .../accounting/base-account/list.html          |  2 +-
 .../templates/accounting/currency/detail.html  | 12 ++++++------
 .../accounting/currency/include/form.html      |  8 ++++----
 .../templates/accounting/currency/list.html    |  8 ++++----
 .../templates/accounting/include/nav.html      | 12 ++++++------
 .../accounting/include/pagination.html         |  2 +-
 .../journal-entry/disbursement/detail.html     |  2 +-
 .../include/account-selector-modal.html        |  2 +-
 .../journal-entry/include/detail.html          | 16 ++++++++--------
 .../journal-entry/include/form-currency.html   |  4 ++--
 .../include/form-debit-credit.html             |  2 +-
 .../journal-entry/include/form-line-item.html  |  4 ++--
 .../accounting/journal-entry/include/form.html | 10 +++++-----
 .../journal-entry-line-item-editor-modal.html  |  4 ++--
 .../original-line-item-selector-modal.html     |  2 +-
 .../accounting/journal-entry/order.html        | 10 +++++-----
 .../journal-entry/receipt/detail.html          |  2 +-
 .../templates/accounting/option/detail.html    |  6 +++---
 .../templates/accounting/option/form.html      |  8 ++++----
 .../include/form-recurring-expense-income.html |  2 +-
 .../option/include/form-recurring-item.html    |  4 ++--
 .../recurring-account-selector-modal.html      |  2 +-
 .../add-journal-entry-material-fab.html        |  4 ++--
 .../report/include/toolbar-buttons.html        | 18 +++++++++---------
 .../templates/accounting/report/unmatched.html |  2 +-
 30 files changed, 96 insertions(+), 96 deletions(-)

diff --git a/src/accounting/templates/accounting/account/detail.html b/src/accounting/templates/accounting/account/detail.html
index 4ac1a88..33547b8 100644
--- a/src/accounting/templates/accounting/account/detail.html
+++ b/src/accounting/templates/accounting/account/detail.html
@@ -27,28 +27,28 @@ First written: 2023/1/31
 
 <div class="mb-3 accounting-toolbar">
   <a class="btn btn-primary" role="button" href="{{ url_for("accounting.account.list")|accounting_or_next }}">
-    <i class="fa-solid fa-circle-chevron-left"></i>
+    <i class="fa-solid fa-circle-chevron-left" aria-hidden="true"></i>
     <span class="d-none d-md-inline">{{ A_("Back") }}</span>
   </a>
   {% if accounting_can_edit() %}
     <a class="btn btn-primary d-none d-md-inline" role="button" href="{{ url_for("accounting.account.edit", account=obj)|accounting_inherit_next }}">
-      <i class="fa-solid fa-pen-to-square"></i>
+      <i class="fa-solid fa-pen-to-square" aria-hidden="true"></i>
       {{ A_("Edit") }}
     </a>
   {% endif %}
   <a class="btn btn-primary" role="button" href="{{ url_for("accounting.account.order", base=obj.base)|accounting_append_next }}">
-    <i class="fa-solid fa-bars-staggered"></i>
+    <i class="fa-solid fa-bars-staggered" aria-hidden="true"></i>
     <span class="d-none d-md-inline">{{ A_("Order") }}</span>
   </a>
   {% if accounting_can_edit() %}
     {% if obj.can_delete %}
       <button class="btn btn-danger" type="button" data-bs-toggle="modal" data-bs-target="#accounting-delete-modal">
-        <i class="fa-solid fa-trash"></i>
+        <i class="fa-solid fa-trash" aria-hidden="true"></i>
         <span class="d-none d-md-inline">{{ A_("Delete") }}</span>
       </button>
     {% else %}
       <button class="btn btn-secondary" type="button" disabled="disabled">
-        <i class="fa-solid fa-trash"></i>
+        <i class="fa-solid fa-trash" aria-hidden="true"></i>
         <span class="d-none d-md-inline">{{ A_("Delete") }}</span>
       </button>
     {% endif %}
@@ -57,8 +57,8 @@ First written: 2023/1/31
 
 {% if accounting_can_edit() %}
   <div class="d-md-none accounting-material-fab">
-    <a class="btn btn-primary" role="button" href="{{ url_for("accounting.account.edit", account=obj)|accounting_inherit_next }}">
-      <i class="fa-solid fa-pen-to-square"></i>
+    <a class="btn btn-primary" role="button" href="{{ url_for("accounting.account.edit", account=obj)|accounting_inherit_next }}" aria-label="{{ A_("Edit") }}">
+      <i class="fa-solid fa-pen-to-square" aria-hidden="true"></i>
     </a>
   </div>
 {% endif %}
diff --git a/src/accounting/templates/accounting/account/include/form.html b/src/accounting/templates/accounting/account/include/form.html
index c444913..a3807ce 100644
--- a/src/accounting/templates/accounting/account/include/form.html
+++ b/src/accounting/templates/accounting/account/include/form.html
@@ -29,7 +29,7 @@ First written: 2023/2/1
 
 <div class="mb-3 accounting-toolbar">
   <a class="btn btn-primary" role="button" href="{% block back_url %}{% endblock %}">
-    <i class="fa-solid fa-circle-chevron-left"></i>
+    <i class="fa-solid fa-circle-chevron-left" aria-hidden="true"></i>
     <span class="d-none d-md-inline">{{ A_("Back") }}</span>
   </a>
 </div>
@@ -71,14 +71,14 @@ First written: 2023/2/1
 
   <div class="d-none d-md-block">
     <button class="btn btn-primary" type="submit">
-      <i class="fa-solid fa-floppy-disk"></i>
+      <i class="fa-solid fa-floppy-disk" aria-hidden="true"></i>
       {{ A_("Save") }}
     </button>
   </div>
 
   <div class="d-md-none accounting-material-fab">
-    <button class="btn btn-primary" type="submit">
-      <i class="fa-solid fa-floppy-disk"></i>
+    <button class="btn btn-primary" type="submit" aria-label="{{ A_("Save") }}">
+      <i class="fa-solid fa-floppy-disk" aria-hidden="true"></i>
     </button>
   </div>
 </form>
@@ -94,7 +94,7 @@ First written: 2023/2/1
         <div class="input-group mb-2">
           <input id="accounting-base-selector-query" class="form-control form-control-sm" type="search" placeholder=" " required="required">
           <label class="input-group-text" for="accounting-base-selector-query">
-            <i class="fa-solid fa-magnifying-glass"></i>
+            <i class="fa-solid fa-magnifying-glass" aria-hidden="true"></i>
             {{ A_("Search") }}
           </label>
         </div>
diff --git a/src/accounting/templates/accounting/account/list.html b/src/accounting/templates/accounting/account/list.html
index b063588..948931e 100644
--- a/src/accounting/templates/accounting/account/list.html
+++ b/src/accounting/templates/accounting/account/list.html
@@ -28,7 +28,7 @@ First written: 2023/1/30
 <div class="mb-2 accounting-toolbar">
   {% if accounting_can_edit() %}
     <a class="btn btn-primary text-nowrap d-none d-md-block" role="button" href="{{ url_for("accounting.account.create")|accounting_append_next }}">
-      <i class="fa-solid fa-plus"></i>
+      <i class="fa-solid fa-plus" aria-hidden="true"></i>
       {{ A_("New") }}
     </a>
   {% endif %}
@@ -36,7 +36,7 @@ First written: 2023/1/30
     <input id="accounting-toolbar-search" class="form-control form-control-sm" type="search" name="q" value="{{ request.args.q }}" placeholder=" " required="required">
     <label id="accounting-toolbar-search-label" for="accounting-toolbar-search" class="input-group-text">
       <button type="submit">
-        <i class="fa-solid fa-magnifying-glass"></i>
+        <i class="fa-solid fa-magnifying-glass" aria-hidden="true"></i>
         <span class="d-none d-md-inline">{{ A_("Search") }}</span>
       </button>
     </label>
@@ -45,8 +45,8 @@ First written: 2023/1/30
 
 {% if accounting_can_edit() %}
   <div class="d-md-none accounting-material-fab">
-    <a class="btn btn-primary" role="button" href="{{ url_for("accounting.account.create")|accounting_append_next }}">
-      <i class="fa-solid fa-plus"></i>
+    <a class="btn btn-primary" role="button" href="{{ url_for("accounting.account.create")|accounting_append_next }}" aria-label="{{ A_("New") }}">
+      <i class="fa-solid fa-plus" aria-hidden="true"></i>
     </a>
   </div>
 {% endif %}
diff --git a/src/accounting/templates/accounting/account/order.html b/src/accounting/templates/accounting/account/order.html
index 5f88c6a..e391d16 100644
--- a/src/accounting/templates/accounting/account/order.html
+++ b/src/accounting/templates/accounting/account/order.html
@@ -32,7 +32,7 @@ First written: 2023/2/2
 
 <div class="mb-3 accounting-toolbar">
   <a class="btn btn-primary" role="button" href="{{ url_for("accounting.account.list")|accounting_or_next }}">
-    <i class="fa-solid fa-circle-chevron-left"></i>
+    <i class="fa-solid fa-circle-chevron-left" aria-hidden="true"></i>
     <span class="d-none d-md-inline">{{ A_("Back") }}</span>
   </a>
 </div>
@@ -51,21 +51,21 @@ First written: 2023/2/2
             <span id="accounting-order-{{ account.id }}-code">{{ account.code }}</span>
             {{ account.title }}
           </div>
-          <i class="fa-solid fa-bars"></i>
+          <i class="fa-solid fa-bars" aria-hidden="true"></i>
         </li>
       {% endfor %}
     </ul>
 
     <div class="d-none d-md-block">
       <button class="btn btn-primary" type="submit">
-        <i class="fa-solid fa-floppy-disk"></i>
+        <i class="fa-solid fa-floppy-disk" aria-hidden="true"></i>
         {{ A_("Save") }}
       </button>
     </div>
 
     <div class="d-md-none accounting-material-fab">
-      <button class="btn btn-primary" type="submit">
-        <i class="fa-solid fa-floppy-disk"></i>
+      <button class="btn btn-primary" type="submit" aria-label="{{ A_("Save") }}">
+        <i class="fa-solid fa-floppy-disk" aria-hidden="true"></i>
       </button>
     </div>
   </form>
diff --git a/src/accounting/templates/accounting/base-account/detail.html b/src/accounting/templates/accounting/base-account/detail.html
index 408bda1..2f4b8e7 100644
--- a/src/accounting/templates/accounting/base-account/detail.html
+++ b/src/accounting/templates/accounting/base-account/detail.html
@@ -27,7 +27,7 @@ First written: 2023/2/1
 
 <div class="mb-3 accounting-toolbar">
   <a class="btn btn-primary" role="button" href="{{ url_for("accounting.account.list")|accounting_or_next }}">
-    <i class="fa-solid fa-circle-chevron-left"></i>
+    <i class="fa-solid fa-circle-chevron-left" aria-hidden="true"></i>
     <span class="d-none d-md-inline">{{ A_("Back") }}</span>
   </a>
 </div>
diff --git a/src/accounting/templates/accounting/base-account/list.html b/src/accounting/templates/accounting/base-account/list.html
index 9a6bcc3..e20a36c 100644
--- a/src/accounting/templates/accounting/base-account/list.html
+++ b/src/accounting/templates/accounting/base-account/list.html
@@ -30,7 +30,7 @@ First written: 2023/1/26
     <input id="accounting-toolbar-search" class="form-control form-control-sm" type="search" name="q" value="{{ request.args.q }}" placeholder=" " required="required">
     <label id="accounting-toolbar-search-label" for="accounting-toolbar-search" class="input-group-text">
       <button type="submit">
-        <i class="fa-solid fa-magnifying-glass"></i>
+        <i class="fa-solid fa-magnifying-glass" aria-hidden="true"></i>
         <span class="d-none d-md-inline">{{ A_("Search") }}</span>
       </button>
     </label>
diff --git a/src/accounting/templates/accounting/currency/detail.html b/src/accounting/templates/accounting/currency/detail.html
index 538a979..3058eeb 100644
--- a/src/accounting/templates/accounting/currency/detail.html
+++ b/src/accounting/templates/accounting/currency/detail.html
@@ -27,24 +27,24 @@ First written: 2023/2/6
 
 <div class="mb-3 accounting-toolbar">
   <a class="btn btn-primary" role="button" href="{{ url_for("accounting.currency.list")|accounting_or_next }}">
-    <i class="fa-solid fa-circle-chevron-left"></i>
+    <i class="fa-solid fa-circle-chevron-left" aria-hidden="true"></i>
     <span class="d-none d-md-inline">{{ A_("Back") }}</span>
   </a>
   {% if accounting_can_edit() %}
     <a class="btn btn-primary d-none d-md-inline" role="button" href="{{ url_for("accounting.currency.edit", currency=obj)|accounting_inherit_next }}">
-      <i class="fa-solid fa-pen-to-square"></i>
+      <i class="fa-solid fa-pen-to-square" aria-hidden="true"></i>
       {{ A_("Edit") }}
     </a>
   {% endif %}
   {% if accounting_can_edit() %}
     {% if obj.can_delete %}
       <button class="btn btn-danger" type="button" data-bs-toggle="modal" data-bs-target="#accounting-delete-modal">
-        <i class="fa-solid fa-trash"></i>
+        <i class="fa-solid fa-trash" aria-hidden="true"></i>
         <span class="d-none d-md-inline">{{ A_("Delete") }}</span>
       </button>
     {% else %}
       <button class="btn btn-secondary" type="button" disabled="disabled">
-        <i class="fa-solid fa-trash"></i>
+        <i class="fa-solid fa-trash" aria-hidden="true"></i>
         <span class="d-none d-md-inline">{{ A_("Delete") }}</span>
       </button>
     {% endif %}
@@ -53,8 +53,8 @@ First written: 2023/2/6
 
 {% if accounting_can_edit() %}
   <div class="d-md-none accounting-material-fab">
-    <a class="btn btn-primary" role="button" href="{{ url_for("accounting.currency.edit", currency=obj)|accounting_inherit_next }}">
-      <i class="fa-solid fa-pen-to-square"></i>
+    <a class="btn btn-primary" role="button" href="{{ url_for("accounting.currency.edit", currency=obj)|accounting_inherit_next }}" aria-label="{{ A_("Edit") }}">
+      <i class="fa-solid fa-pen-to-square" aria-hidden="true"></i>
     </a>
   </div>
 {% endif %}
diff --git a/src/accounting/templates/accounting/currency/include/form.html b/src/accounting/templates/accounting/currency/include/form.html
index 729dbcb..0f576d9 100644
--- a/src/accounting/templates/accounting/currency/include/form.html
+++ b/src/accounting/templates/accounting/currency/include/form.html
@@ -29,7 +29,7 @@ First written: 2023/2/6
 
 <div class="mb-3 accounting-toolbar">
   <a class="btn btn-primary" role="button" href="{% block back_url %}{% endblock %}">
-    <i class="fa-solid fa-circle-chevron-left"></i>
+    <i class="fa-solid fa-circle-chevron-left" aria-hidden="true"></i>
     <span class="d-none d-md-inline">{{ A_("Back") }}</span>
   </a>
 </div>
@@ -53,14 +53,14 @@ First written: 2023/2/6
 
   <div class="d-none d-md-block">
     <button class="btn btn-primary" type="submit">
-      <i class="fa-solid fa-floppy-disk"></i>
+      <i class="fa-solid fa-floppy-disk" aria-hidden="true"></i>
       {{ A_("Save") }}
     </button>
   </div>
 
   <div class="d-md-none accounting-material-fab">
-    <button class="btn btn-primary" type="submit">
-      <i class="fa-solid fa-floppy-disk"></i>
+    <button class="btn btn-primary" type="submit" aria-label="{{ A_("Save") }}">
+      <i class="fa-solid fa-floppy-disk" aria-hidden="true"></i>
     </button>
   </div>
 </form>
diff --git a/src/accounting/templates/accounting/currency/list.html b/src/accounting/templates/accounting/currency/list.html
index c700a5a..d845d01 100644
--- a/src/accounting/templates/accounting/currency/list.html
+++ b/src/accounting/templates/accounting/currency/list.html
@@ -28,7 +28,7 @@ First written: 2023/2/6
 <div class="mb-2 accounting-toolbar">
   {% if accounting_can_edit() %}
     <a class="btn btn-primary text-nowrap d-none d-md-block" role="button" href="{{ url_for("accounting.currency.create")|accounting_append_next }}">
-      <i class="fa-solid fa-plus"></i>
+      <i class="fa-solid fa-plus" aria-hidden="true"></i>
       {{ A_("New") }}
     </a>
   {% endif %}
@@ -36,7 +36,7 @@ First written: 2023/2/6
     <input id="accounting-toolbar-search" class="form-control form-control-sm" type="search" name="q" value="{{ request.args.q }}" placeholder=" " required="required">
     <label id="accounting-toolbar-search-label" for="accounting-toolbar-search" class="input-group-text">
       <button type="submit">
-        <i class="fa-solid fa-magnifying-glass"></i>
+        <i class="fa-solid fa-magnifying-glass" aria-hidden="true"></i>
         <span class="d-none d-md-inline">{{ A_("Search") }}</span>
       </button>
     </label>
@@ -45,8 +45,8 @@ First written: 2023/2/6
 
 {% if accounting_can_edit() %}
   <div class="d-md-none accounting-material-fab">
-    <a class="btn btn-primary" role="button" href="{{ url_for("accounting.currency.create")|accounting_append_next }}">
-      <i class="fa-solid fa-plus"></i>
+    <a class="btn btn-primary" role="button" href="{{ url_for("accounting.currency.create")|accounting_append_next }}" aria-label="{{ A_("New") }}">
+      <i class="fa-solid fa-plus" aria-hidden="true"></i>
     </a>
   </div>
 {% endif %}
diff --git a/src/accounting/templates/accounting/include/nav.html b/src/accounting/templates/accounting/include/nav.html
index 01b83e1..09c5f13 100644
--- a/src/accounting/templates/accounting/include/nav.html
+++ b/src/accounting/templates/accounting/include/nav.html
@@ -23,38 +23,38 @@ First written: 2023/1/26
 {% if accounting_can_view() %}
   <li class="nav-item dropdown">
     <span class="nav-link dropdown-toggle" data-bs-toggle="dropdown">
-      <i class="fa-solid fa-file-invoice-dollar"></i>
+      <i class="fa-solid fa-file-invoice-dollar" aria-hidden="true"></i>
       {{ A_("Accounting") }}
     </span>
     <ul class="dropdown-menu">
       <li>
         <a class="dropdown-item {% if request.endpoint and request.endpoint.startswith("accounting-report.") %} active {% endif %}" href="{{ url_for("accounting-report.default") }}">
-          <i class="fa-solid fa-book"></i>
+          <i class="fa-solid fa-book" aria-hidden="true"></i>
           {{ A_("Reports") }}
         </a>
       </li>
       <li>
         <a class="dropdown-item {% if request.endpoint and request.endpoint.startswith("accounting.account.") %} active {% endif %}" href="{{ url_for("accounting.account.list") }}">
-          <i class="fa-solid fa-clipboard"></i>
+          <i class="fa-solid fa-clipboard" aria-hidden="true"></i>
           {{ A_("Accounts") }}
         </a>
       </li>
       <li>
         <a class="dropdown-item {% if request.endpoint and request.endpoint.startswith("accounting.base-account.") %} active {% endif %}" href="{{ url_for("accounting.base-account.list") }}">
-          <i class="fa-solid fa-list"></i>
+          <i class="fa-solid fa-list" aria-hidden="true"></i>
           {{ A_("Base Accounts") }}
         </a>
       </li>
       <li>
         <a class="dropdown-item {% if request.endpoint and request.endpoint.startswith("accounting.currency.") %} active {% endif %}" href="{{ url_for("accounting.currency.list") }}">
-          <i class="fa-solid fa-money-bill-wave"></i>
+          <i class="fa-solid fa-money-bill-wave" aria-hidden="true"></i>
           {{ A_("Currencies") }}
         </a>
       </li>
       {% if accounting_can_admin() %}
         <li>
           <a class="dropdown-item {% if request.endpoint and request.endpoint.startswith("accounting.option.") %} active {% endif %}" href="{{ url_for("accounting.option.detail") }}">
-            <i class="fa-solid fa-gear"></i>
+            <i class="fa-solid fa-gear" aria-hidden="true"></i>
             {{ A_("Settings") }}
           </a>
         </li>
diff --git a/src/accounting/templates/accounting/include/pagination.html b/src/accounting/templates/accounting/include/pagination.html
index e19192c..0485373 100644
--- a/src/accounting/templates/accounting/include/pagination.html
+++ b/src/accounting/templates/accounting/include/pagination.html
@@ -38,7 +38,7 @@ First written: 2023/1/26
         {% endif %}
       {% endfor %}
       <li class="page-item d-none d-md-inline active dropdown">
-        <div class="page-link dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
+        <div class="page-link dropdown-toggle" role="button" tabindex="0" data-bs-toggle="dropdown" aria-expanded="false">
           {{ pagination.page_size }}
         </div>
         <ul class="dropdown-menu">
diff --git a/src/accounting/templates/accounting/journal-entry/disbursement/detail.html b/src/accounting/templates/accounting/journal-entry/disbursement/detail.html
index a3e3bce..3b56d4d 100644
--- a/src/accounting/templates/accounting/journal-entry/disbursement/detail.html
+++ b/src/accounting/templates/accounting/journal-entry/disbursement/detail.html
@@ -23,7 +23,7 @@ First written: 2023/2/26
 
 {% block as_transfer %}
   <a class="btn btn-primary" role="button" href="{{ url_for("accounting.journal-entry.edit", journal_entry=obj)|accounting_journal_entry_to_transfer|accounting_inherit_next }}">
-    <i class="fa-solid fa-table-columns"></i>
+    <i class="fa-solid fa-table-columns" aria-hidden="true"></i>
     <span class="d-none d-md-inline">{{ A_("As Transfer") }}</span>
   </a>
 {% endblock %}
diff --git a/src/accounting/templates/accounting/journal-entry/include/account-selector-modal.html b/src/accounting/templates/accounting/journal-entry/include/account-selector-modal.html
index 917ea3c..5e5148a 100644
--- a/src/accounting/templates/accounting/journal-entry/include/account-selector-modal.html
+++ b/src/accounting/templates/accounting/journal-entry/include/account-selector-modal.html
@@ -30,7 +30,7 @@ First written: 2023/2/25
         <div class="input-group mb-2">
           <input id="accounting-account-selector-{{ debit_credit }}-query" class="form-control form-control-sm" type="search" placeholder=" " required="required">
           <label class="input-group-text" for="accounting-account-selector-{{ debit_credit }}-query">
-            <i class="fa-solid fa-magnifying-glass"></i>
+            <i class="fa-solid fa-magnifying-glass" aria-hidden="true"></i>
             {{ A_("Search") }}
           </label>
         </div>
diff --git a/src/accounting/templates/accounting/journal-entry/include/detail.html b/src/accounting/templates/accounting/journal-entry/include/detail.html
index 69d4191..025a0a8 100644
--- a/src/accounting/templates/accounting/journal-entry/include/detail.html
+++ b/src/accounting/templates/accounting/journal-entry/include/detail.html
@@ -27,29 +27,29 @@ First written: 2023/2/26
 
 <div class="mb-3 accounting-toolbar">
   <a class="btn btn-primary" role="button" href="{{ url_for("accounting-report.default")|accounting_or_next }}">
-    <i class="fa-solid fa-circle-chevron-left"></i>
+    <i class="fa-solid fa-circle-chevron-left" aria-hidden="true"></i>
     <span class="d-none d-md-inline">{{ A_("Back") }}</span>
   </a>
   {% if accounting_can_edit() %}
     <a class="btn btn-primary d-none d-md-inline" role="button" href="{{ url_for("accounting.journal-entry.edit", journal_entry=obj)|accounting_inherit_next }}">
-      <i class="fa-solid fa-pen-to-square"></i>
+      <i class="fa-solid fa-pen-to-square" aria-hidden="true"></i>
       {{ A_("Edit") }}
     </a>
   {% endif %}
   <a class="btn btn-primary" role="button" href="{{ url_for("accounting.journal-entry.order", date=obj.date)|accounting_append_next }}">
-    <i class="fa-solid fa-bars-staggered"></i>
+    <i class="fa-solid fa-bars-staggered" aria-hidden="true"></i>
     <span class="d-none d-md-inline">{{ A_("Order") }}</span>
   </a>
   {% if accounting_can_edit() %}
     {% block as_transfer %}{% endblock %}
     {% if obj.can_delete %}
       <button class="btn btn-danger" type="button" data-bs-toggle="modal" data-bs-target="#accounting-delete-modal">
-        <i class="fa-solid fa-trash"></i>
+        <i class="fa-solid fa-trash" aria-hidden="true"></i>
         <span class="d-none d-md-inline">{{ A_("Delete") }}</span>
       </button>
     {% else %}
       <button class="btn btn-secondary" type="button" disabled="disabled">
-        <i class="fa-solid fa-trash"></i>
+        <i class="fa-solid fa-trash" aria-hidden="true"></i>
         <span class="d-none d-md-inline">{{ A_("Delete") }}</span>
       </button>
     {% endif %}
@@ -58,8 +58,8 @@ First written: 2023/2/26
 
 {% if accounting_can_edit() %}
   <div class="d-md-none accounting-material-fab">
-    <a class="btn btn-primary" role="button" href="{{ url_for("accounting.journal-entry.edit", journal_entry=obj)|accounting_inherit_next }}">
-      <i class="fa-solid fa-pen-to-square"></i>
+    <a class="btn btn-primary" role="button" href="{{ url_for("accounting.journal-entry.edit", journal_entry=obj)|accounting_inherit_next }}" aria-label="{{ A_("Edit") }}">
+      <i class="fa-solid fa-pen-to-square" aria-hidden="true"></i>
     </a>
   </div>
 {% endif %}
@@ -104,7 +104,7 @@ First written: 2023/2/26
   {% if obj.note %}
     <div class="card mb-3">
       <div class="card-body">
-        <i class="far fa-comment-dots"></i>
+        <i class="far fa-comment-dots" aria-hidden="true"></i>
         {{ obj.note|accounting_journal_entry_text2html|safe }}
       </div>
     </div>
diff --git a/src/accounting/templates/accounting/journal-entry/include/form-currency.html b/src/accounting/templates/accounting/journal-entry/include/form-currency.html
index 2b39cd2..12ae5d7 100644
--- a/src/accounting/templates/accounting/journal-entry/include/form-currency.html
+++ b/src/accounting/templates/accounting/journal-entry/include/form-currency.html
@@ -35,8 +35,8 @@ First written: 2023/3/21
       </div>
 
       <div>
-        <button id="accounting-currency-{{ currency_index }}-delete" class="btn btn-danger rounded-circle {% if only_one_currency_form %} d-none {% endif %}" type="button" data-target="accounting-currency-{{ currency_index }}">
-          <i class="fas fa-minus"></i>
+        <button id="accounting-currency-{{ currency_index }}-delete" class="btn btn-danger rounded-circle {% if only_one_currency_form %} d-none {% endif %}" type="button" data-target="accounting-currency-{{ currency_index }}" aria-label="{{ A_("Remove") }}">
+          <i class="fas fa-minus" aria-hidden="true"></i>
         </button>
       </div>
     </div>
diff --git a/src/accounting/templates/accounting/journal-entry/include/form-debit-credit.html b/src/accounting/templates/accounting/journal-entry/include/form-debit-credit.html
index d4834c0..7e135f5 100644
--- a/src/accounting/templates/accounting/journal-entry/include/form-debit-credit.html
+++ b/src/accounting/templates/accounting/journal-entry/include/form-debit-credit.html
@@ -41,7 +41,7 @@ First written: 2023/3/21
 
       <div>
         <button id="accounting-currency-{{ currency_index }}-{{ debit_credit }}-add-line-item" class="btn btn-primary" type="button" data-currency-index="{{ currency_index }}" data-debit-credit="{{ debit_credit }}" data-bs-toggle="modal" data-bs-target="#accounting-line-item-editor-modal">
-          <i class="fas fa-plus"></i>
+          <i class="fas fa-plus" aria-hidden="true"></i>
           {{ A_("New") }}
         </button>
       </div>
diff --git a/src/accounting/templates/accounting/journal-entry/include/form-line-item.html b/src/accounting/templates/accounting/journal-entry/include/form-line-item.html
index 0eafbf6..090da1a 100644
--- a/src/accounting/templates/accounting/journal-entry/include/form-line-item.html
+++ b/src/accounting/templates/accounting/journal-entry/include/form-line-item.html
@@ -69,8 +69,8 @@ First written: 2023/2/25
   </div>
 
   <div>
-    <button id="accounting-currency-{{ currency_index }}-{{ debit_credit }}-{{ line_item_index }}-delete" class="btn btn-danger rounded-circle {% if only_one_form or form.offsets %} d-none {% endif %}" type="button" data-target="accounting-currency-{{ currency_index }}-{{ debit_credit }}-{{ line_item_index }}">
-      <i class="fas fa-minus"></i>
+    <button id="accounting-currency-{{ currency_index }}-{{ debit_credit }}-{{ line_item_index }}-delete" class="btn btn-danger rounded-circle {% if only_one_form or form.offsets %} d-none {% endif %}" type="button" data-target="accounting-currency-{{ currency_index }}-{{ debit_credit }}-{{ line_item_index }}" aria-label="{{ A_("Remove") }}">
+      <i class="fas fa-minus" aria-hidden="true"></i>
     </button>
   </div>
 </li>
diff --git a/src/accounting/templates/accounting/journal-entry/include/form.html b/src/accounting/templates/accounting/journal-entry/include/form.html
index 0482668..e14c2a0 100644
--- a/src/accounting/templates/accounting/journal-entry/include/form.html
+++ b/src/accounting/templates/accounting/journal-entry/include/form.html
@@ -34,7 +34,7 @@ First written: 2023/2/26
 
 <div class="mb-3 accounting-toolbar">
   <a class="btn btn-primary" role="button" href="{% block back_url %}{% endblock %}">
-    <i class="fa-solid fa-circle-chevron-left"></i>
+    <i class="fa-solid fa-circle-chevron-left" aria-hidden="true"></i>
     <span class="d-none d-md-inline">{{ A_("Back") }}</span>
   </a>
 </div>
@@ -60,7 +60,7 @@ First written: 2023/2/26
 
       <div>
         <button id="accounting-add-currency" class="btn btn-primary" type="button">
-          <i class="fas fa-plus"></i>
+          <i class="fas fa-plus" aria-hidden="true"></i>
           {{ A_("New") }}
         </button>
       </div>
@@ -76,14 +76,14 @@ First written: 2023/2/26
 
   <div class="d-none d-md-block">
     <button class="btn btn-primary" type="submit">
-      <i class="fa-solid fa-floppy-disk"></i>
+      <i class="fa-solid fa-floppy-disk" aria-hidden="true"></i>
       {{ A_("Save") }}
     </button>
   </div>
 
   <div class="d-md-none accounting-material-fab">
-    <button class="btn btn-primary" type="submit">
-      <i class="fa-solid fa-floppy-disk"></i>
+    <button class="btn btn-primary" type="submit" aria-label="{{ A_("Save") }}">
+      <i class="fa-solid fa-floppy-disk" aria-hidden="true"></i>
     </button>
   </div>
 </form>
diff --git a/src/accounting/templates/accounting/journal-entry/include/journal-entry-line-item-editor-modal.html b/src/accounting/templates/accounting/journal-entry/include/journal-entry-line-item-editor-modal.html
index a122989..16b77fe 100644
--- a/src/accounting/templates/accounting/journal-entry/include/journal-entry-line-item-editor-modal.html
+++ b/src/accounting/templates/accounting/journal-entry/include/journal-entry-line-item-editor-modal.html
@@ -39,8 +39,8 @@ First written: 2023/2/25
             </div>
 
             <div>
-              <button id="accounting-line-item-editor-original-line-item-delete" class="btn btn-danger rounded-circle" type="button">
-                <i class="fas fa-minus"></i>
+              <button id="accounting-line-item-editor-original-line-item-delete" class="btn btn-danger rounded-circle" type="button" aria-label="{{ A_("Remove") }}">
+                <i class="fas fa-minus" aria-hidden="true"></i>
               </button>
             </div>
           </div>
diff --git a/src/accounting/templates/accounting/journal-entry/include/original-line-item-selector-modal.html b/src/accounting/templates/accounting/journal-entry/include/original-line-item-selector-modal.html
index c931964..b35ed7c 100644
--- a/src/accounting/templates/accounting/journal-entry/include/original-line-item-selector-modal.html
+++ b/src/accounting/templates/accounting/journal-entry/include/original-line-item-selector-modal.html
@@ -30,7 +30,7 @@ First written: 2023/2/25
         <div class="input-group mb-2">
           <input id="accounting-original-line-item-selector-query" class="form-control form-control-sm" type="search" placeholder=" " required="required">
           <label class="input-group-text" for="accounting-original-line-item-selector-query">
-            <i class="fa-solid fa-magnifying-glass"></i>
+            <i class="fa-solid fa-magnifying-glass" aria-hidden="true"></i>
             {{ A_("Search") }}
           </label>
         </div>
diff --git a/src/accounting/templates/accounting/journal-entry/order.html b/src/accounting/templates/accounting/journal-entry/order.html
index 5baf06f..b676636 100644
--- a/src/accounting/templates/accounting/journal-entry/order.html
+++ b/src/accounting/templates/accounting/journal-entry/order.html
@@ -32,7 +32,7 @@ First written: 2023/2/26
 
 <div class="mb-3 accounting-toolbar">
   <a class="btn btn-primary" role="button" href="{{ url_for("accounting-report.default")|accounting_or_next }}">
-    <i class="fa-solid fa-circle-chevron-left"></i>
+    <i class="fa-solid fa-circle-chevron-left" aria-hidden="true"></i>
     <span class="d-none d-md-inline">{{ A_("Back") }}</span>
   </a>
 </div>
@@ -50,21 +50,21 @@ First written: 2023/2/26
           {% with journal_entry = item %}
             {% include "accounting/journal-entry/include/order-journal-entry.html" %}
           {% endwith %}
-          <i class="fa-solid fa-bars"></i>
+          <i class="fa-solid fa-bars" aria-hidden="true"></i>
         </li>
       {% endfor %}
     </ul>
 
     <div class="d-none d-md-block">
       <button class="btn btn-primary" type="submit">
-        <i class="fa-solid fa-floppy-disk"></i>
+        <i class="fa-solid fa-floppy-disk" aria-hidden="true"></i>
         {{ A_("Save") }}
       </button>
     </div>
 
     <div class="d-md-none accounting-material-fab">
-      <button class="btn btn-primary" type="submit">
-        <i class="fa-solid fa-floppy-disk"></i>
+      <button class="btn btn-primary" type="submit" aria-label="{{ A_("Save") }}">
+        <i class="fa-solid fa-floppy-disk" aria-hidden="true"></i>
       </button>
     </div>
   </form>
diff --git a/src/accounting/templates/accounting/journal-entry/receipt/detail.html b/src/accounting/templates/accounting/journal-entry/receipt/detail.html
index 8255817..25fba96 100644
--- a/src/accounting/templates/accounting/journal-entry/receipt/detail.html
+++ b/src/accounting/templates/accounting/journal-entry/receipt/detail.html
@@ -23,7 +23,7 @@ First written: 2023/2/26
 
 {% block as_transfer %}
   <a class="btn btn-primary" role="button" href="{{ url_for("accounting.journal-entry.edit", journal_entry=obj)|accounting_journal_entry_to_transfer|accounting_inherit_next }}">
-    <i class="fa-solid fa-table-columns"></i>
+    <i class="fa-solid fa-table-columns" aria-hidden="true"></i>
     <span class="d-none d-md-inline">{{ A_("As Transfer") }}</span>
   </a>
 {% endblock %}
diff --git a/src/accounting/templates/accounting/option/detail.html b/src/accounting/templates/accounting/option/detail.html
index f73b986..8e85c37 100644
--- a/src/accounting/templates/accounting/option/detail.html
+++ b/src/accounting/templates/accounting/option/detail.html
@@ -27,14 +27,14 @@ First written: 2023/3/22
 
 <div class="mb-3 accounting-toolbar">
   <a class="btn btn-primary d-none d-md-inline" role="button" href="{{ url_for("accounting.option.edit")|accounting_inherit_next }}">
-    <i class="fa-solid fa-pen-to-square"></i>
+    <i class="fa-solid fa-pen-to-square" aria-hidden="true"></i>
     {{ A_("Edit") }}
   </a>
 </div>
 
 <div class="d-md-none accounting-material-fab">
-  <a class="btn btn-primary" role="button" href="{{ url_for("accounting.option.edit")|accounting_inherit_next }}">
-    <i class="fa-solid fa-pen-to-square"></i>
+  <a class="btn btn-primary" role="button" href="{{ url_for("accounting.option.edit")|accounting_inherit_next }}" aria-label="{{ A_("Edit") }}">
+    <i class="fa-solid fa-pen-to-square" aria-hidden="true"></i>
   </a>
 </div>
 
diff --git a/src/accounting/templates/accounting/option/form.html b/src/accounting/templates/accounting/option/form.html
index 8238816..895ba32 100644
--- a/src/accounting/templates/accounting/option/form.html
+++ b/src/accounting/templates/accounting/option/form.html
@@ -32,7 +32,7 @@ First written: 2023/3/22
 
 <div class="mb-3 accounting-toolbar">
   <a class="btn btn-primary" role="button" href="{{ url_for("accounting.option.detail")|accounting_inherit_next }}">
-    <i class="fa-solid fa-circle-chevron-left"></i>
+    <i class="fa-solid fa-circle-chevron-left" aria-hidden="true"></i>
     <span class="d-none d-md-inline">{{ A_("Back") }}</span>
   </a>
 </div>
@@ -76,14 +76,14 @@ First written: 2023/3/22
 
   <div class="d-none d-md-block">
     <button class="btn btn-primary" type="submit">
-      <i class="fa-solid fa-floppy-disk"></i>
+      <i class="fa-solid fa-floppy-disk" aria-hidden="true"></i>
       {{ A_("Save") }}
     </button>
   </div>
 
   <div class="d-md-none accounting-material-fab">
-    <button class="btn btn-primary" type="submit">
-      <i class="fa-solid fa-floppy-disk"></i>
+    <button class="btn btn-primary" type="submit" aria-label="{{ A_("Save") }}">
+      <i class="fa-solid fa-floppy-disk" aria-hidden="true"></i>
     </button>
   </div>
 </form>
diff --git a/src/accounting/templates/accounting/option/include/form-recurring-expense-income.html b/src/accounting/templates/accounting/option/include/form-recurring-expense-income.html
index cd126e1..5a69cd5 100644
--- a/src/accounting/templates/accounting/option/include/form-recurring-expense-income.html
+++ b/src/accounting/templates/accounting/option/include/form-recurring-expense-income.html
@@ -33,7 +33,7 @@ First written: 2023/3/22
 
     <div>
       <button id="accounting-recurring-{{ expense_income }}-add" class="btn btn-primary" type="button" data-bs-toggle="modal" data-bs-target="#accounting-recurring-item-editor-{{ expense_income }}-modal">
-        <i class="fas fa-plus"></i>
+        <i class="fas fa-plus" aria-hidden="true"></i>
         {{ A_("New") }}
       </button>
     </div>
diff --git a/src/accounting/templates/accounting/option/include/form-recurring-item.html b/src/accounting/templates/accounting/option/include/form-recurring-item.html
index f808a86..b5e9a55 100644
--- a/src/accounting/templates/accounting/option/include/form-recurring-item.html
+++ b/src/accounting/templates/accounting/option/include/form-recurring-item.html
@@ -36,8 +36,8 @@ First written: 2023/3/22
     </div>
 
     <div class="ms-2">
-      <button id="accounting-recurring-{{ expense_income }}-{{ item_index }}-delete" class="btn btn-danger rounded-circle" type="button">
-        <i class="fas fa-minus"></i>
+      <button id="accounting-recurring-{{ expense_income }}-{{ item_index }}-delete" class="btn btn-danger rounded-circle" type="button" aria-label="{{ A_("Remove") }}">
+        <i class="fas fa-minus" aria-hidden="true"></i>
       </button>
     </div>
   </div>
diff --git a/src/accounting/templates/accounting/option/include/recurring-account-selector-modal.html b/src/accounting/templates/accounting/option/include/recurring-account-selector-modal.html
index 6532bb2..bd62f2f 100644
--- a/src/accounting/templates/accounting/option/include/recurring-account-selector-modal.html
+++ b/src/accounting/templates/accounting/option/include/recurring-account-selector-modal.html
@@ -30,7 +30,7 @@ First written: 2023/3/22
         <div class="input-group mb-2">
           <input id="accounting-recurring-accounting-selector-{{ expense_income }}-query" class="form-control form-control-sm" type="search" placeholder=" " required="required">
           <label class="input-group-text" for="accounting-recurring-accounting-selector-{{ expense_income }}-query">
-            <i class="fa-solid fa-magnifying-glass"></i>
+            <i class="fa-solid fa-magnifying-glass" aria-hidden="true"></i>
             {{ A_("Search") }}
           </label>
         </div>
diff --git a/src/accounting/templates/accounting/report/include/add-journal-entry-material-fab.html b/src/accounting/templates/accounting/report/include/add-journal-entry-material-fab.html
index dd04b9c..f3ab43b 100644
--- a/src/accounting/templates/accounting/report/include/add-journal-entry-material-fab.html
+++ b/src/accounting/templates/accounting/report/include/add-journal-entry-material-fab.html
@@ -32,8 +32,8 @@ First written: 2023/2/25
         {{ A_("Transfer") }}
       </a>
     </div>
-    <button id="accounting-btn-material-fab-speed-dial" class="btn btn-primary rounded-circle accounting-btn-material-fab" type="button" data-target="accounting-material-fab-speed-dial">
-      <i class="fas fa-plus"></i>
+    <button id="accounting-btn-material-fab-speed-dial" class="btn btn-primary rounded-circle accounting-btn-material-fab" type="button" data-target="accounting-material-fab-speed-dial" aria-label="{{ A_("New Journal Entry") }}">
+      <i class="fas fa-plus" aria-hidden="true"></i>
     </button>
   </div>
 {% endif %}
diff --git a/src/accounting/templates/accounting/report/include/toolbar-buttons.html b/src/accounting/templates/accounting/report/include/toolbar-buttons.html
index 73b1977..e4a0c11 100644
--- a/src/accounting/templates/accounting/report/include/toolbar-buttons.html
+++ b/src/accounting/templates/accounting/report/include/toolbar-buttons.html
@@ -22,7 +22,7 @@ First written: 2023/3/8
 {% if accounting_can_edit() %}
   <div class="btn-group d-none d-md-flex" role="group">
     <button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
-      <i class="fa-solid fa-plus"></i>
+      <i class="fa-solid fa-plus" aria-hidden="true"></i>
       <span class="d-none d-md-inline">{{ A_("New") }}</span>
     </button>
     <ul class="dropdown-menu">
@@ -46,7 +46,7 @@ First written: 2023/3/8
 {% endif %}
 <div class="btn-group" role="group">
   <button id="accounting-choose-report" class="btn btn-primary dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false">
-    <i class="fa-solid fa-book"></i>
+    <i class="fa-solid fa-book" aria-hidden="true"></i>
     <span class="d-none d-md-inline">{{ A_("Report") }}</span>
   </button>
   <ul class="dropdown-menu" aria-labelledby="accounting-choose-report">
@@ -60,7 +60,7 @@ First written: 2023/3/8
     {% endfor %}
     <li>
       <span class="dropdown-item {% if report.report_chooser.is_search %} active {% endif %} accounting-clickable" data-bs-toggle="modal" data-bs-target="#accounting-search-modal">
-        <i class="fa-solid fa-magnifying-glass"></i>
+        <i class="fa-solid fa-magnifying-glass" aria-hidden="true"></i>
         {{ A_("Search") }}
       </span>
     </li>
@@ -69,7 +69,7 @@ First written: 2023/3/8
 {% if use_currency_chooser %}
   <div class="btn-group" role="group">
     <button id="accounting-choose-currency" class="btn btn-primary dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false">
-      <i class="fa-solid fa-money-bill-wave"></i>
+      <i class="fa-solid fa-money-bill-wave" aria-hidden="true"></i>
       <span class="d-none d-md-inline">{{ A_("Currency") }}</span>
     </button>
     <ul class="dropdown-menu" aria-labelledby="accounting-choose-currency">
@@ -86,7 +86,7 @@ First written: 2023/3/8
 {% if use_account_chooser %}
   <div class="btn-group" role="group">
     <button id="accounting-choose-account" class="btn btn-primary dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false">
-      <i class="fa-solid fa-clipboard"></i>
+      <i class="fa-solid fa-clipboard" aria-hidden="true"></i>
       <span class="d-none d-md-inline">{{ A_("Account") }}</span>
     </button>
     <ul class="dropdown-menu accounting-toolbar-accounts" aria-labelledby="accounting-choose-account">
@@ -102,18 +102,18 @@ First written: 2023/3/8
 {% endif %}
 {% if use_period_chooser %}
   <button class="btn btn-primary" type="button" data-bs-toggle="modal" data-bs-target="#accounting-period-chooser-modal">
-    <i class="fa-solid fa-calendar-day"></i>
+    <i class="fa-solid fa-calendar-day" aria-hidden="true"></i>
     <span class="d-none d-md-inline">{{ A_("Period") }}</span>
   </button>
 {% endif %}
 {% if report.has_data %}
   <a class="btn btn-primary" role="button" href="{{ report.csv_uri }}">
-    <i class="fa-solid fa-download"></i>
+    <i class="fa-solid fa-download" aria-hidden="true"></i>
     <span class="d-none d-md-inline">{{ A_("Download") }}</span>
   </a>
 {% else %}
   <button class="btn btn-secondary" type="button" disabled="disabled">
-    <i class="fa-solid fa-download"></i>
+    <i class="fa-solid fa-download" aria-hidden="true"></i>
     <span class="d-none d-md-inline">{{ A_("Download") }}</span>
   </button>
 {% endif %}
@@ -122,7 +122,7 @@ First written: 2023/3/8
     <input id="accounting-toolbar-search" class="form-control form-control-sm" type="search" name="q" value="{{ request.args.q }}" placeholder=" " required="required">
     <label id="accounting-toolbar-search-label" for="accounting-toolbar-search" class="input-group-text">
       <button type="submit">
-        <i class="fa-solid fa-magnifying-glass"></i>
+        <i class="fa-solid fa-magnifying-glass" aria-hidden="true"></i>
         <span class="d-none d-md-inline">{{ A_("Search") }}</span>
       </button>
     </label>
diff --git a/src/accounting/templates/accounting/report/unmatched.html b/src/accounting/templates/accounting/report/unmatched.html
index d80da08..b4d46aa 100644
--- a/src/accounting/templates/accounting/report/unmatched.html
+++ b/src/accounting/templates/accounting/report/unmatched.html
@@ -42,7 +42,7 @@ First written: 2023/4/17
 
 {% if report.matched_pairs %}
   <button class="btn btn-primary" type="button" data-bs-toggle="modal" data-bs-target="#accounting-match-modal">
-    <i class="fa-solid fa-link"></i>
+    <i class="fa-solid fa-link" aria-hidden="true"></i>
     {{ A_("Match") }}
   </button>