diff --git a/resources/assets/v2/src/js/accessibility.js b/resources/assets/v2/src/js/accessibility.js
new file mode 100644
index 00000000000..08f9b9b1891
--- /dev/null
+++ b/resources/assets/v2/src/js/accessibility.js
@@ -0,0 +1,72 @@
+document.addEventListener('DOMContentLoaded', function() {
+    const sidebarToggle = document.querySelector('.sidebar-toggle');
+    if (sidebarToggle) {
+        sidebarToggle.addEventListener('click', function() {
+            const isExpanded = this.getAttribute('aria-expanded') === 'true';
+            this.setAttribute('aria-expanded', !isExpanded);
+        });
+    }
+
+    const treeviewLinks = document.querySelectorAll('.treeview > a');
+    treeviewLinks.forEach(function(link) {
+        link.addEventListener('click', function(e) {
+            e.preventDefault();
+            const isExpanded = this.getAttribute('aria-expanded') === 'true';
+            this.setAttribute('aria-expanded', !isExpanded);
+            
+            const submenu = this.nextElementSibling;
+            if (submenu && submenu.classList.contains('treeview-menu')) {
+                submenu.style.display = isExpanded ? 'none' : 'block';
+            }
+        });
+    });
+
+    const modals = document.querySelectorAll('.modal');
+    modals.forEach(function(modal) {
+        modal.addEventListener('shown.bs.modal', function() {
+            const firstFocusable = modal.querySelector('input, button, select, textarea, [tabindex]:not([tabindex="-1"])');
+            if (firstFocusable) {
+                firstFocusable.focus();
+            }
+        });
+
+        modal.addEventListener('hidden.bs.modal', function() {
+            const trigger = document.querySelector('[data-target="#' + modal.id + '"]');
+            if (trigger) {
+                trigger.focus();
+            }
+        });
+    });
+
+    function announceToScreenReader(message) {
+        const announcement = document.createElement('div');
+        announcement.setAttribute('aria-live', 'polite');
+        announcement.setAttribute('aria-atomic', 'true');
+        announcement.className = 'sr-only';
+        announcement.textContent = message;
+        document.body.appendChild(announcement);
+        
+        setTimeout(function() {
+            document.body.removeChild(announcement);
+        }, 1000);
+    }
+
+    const forms = document.querySelectorAll('form');
+    forms.forEach(function(form) {
+        form.addEventListener('submit', function(e) {
+            const errors = form.querySelectorAll('.text-danger[role="alert"]');
+            if (errors.length > 0) {
+                announceToScreenReader('Form has ' + errors.length + ' error' + (errors.length > 1 ? 's' : '') + '. Please review and correct.');
+            }
+        });
+    });
+
+    document.addEventListener('keydown', function(e) {
+        if (e.key === 'Escape') {
+            const openModals = document.querySelectorAll('.modal.in, .modal.show');
+            openModals.forEach(function(modal) {
+                $(modal).modal('hide');
+            });
+        }
+    });
+});
diff --git a/resources/assets/v2/src/sass/app.scss b/resources/assets/v2/src/sass/app.scss
index 872e5bda2d6..8f9809e0247 100644
--- a/resources/assets/v2/src/sass/app.scss
+++ b/resources/assets/v2/src/sass/app.scss
@@ -48,7 +48,20 @@ $success: #64B624 !default;
 
 
 // some local CSS
-.skip-links {display: none;}
+.skip-links {
+    position: absolute;
+    left: -9999px;
+    z-index: 999999;
+    padding: 8px 16px;
+    background: #000;
+    color: #fff;
+    text-decoration: none;
+    border-radius: 3px;
+}
+.skip-links:focus {
+    left: 6px;
+    top: 7px;
+}
 
 /*
 Remove bottom margin from unstyled lists
@@ -80,6 +93,59 @@ h3.hover-expand:hover {
     appearance: auto;
 }
 
+.form-control:focus {
+    outline: 2px solid #1E6581;
+    outline-offset: 2px;
+}
+
+.btn:focus {
+    outline: 2px solid #1E6581;
+    outline-offset: 2px;
+}
+
+a:focus {
+    outline: 2px solid #1E6581;
+    outline-offset: 2px;
+}
+
+.sidebar-toggle:focus {
+    outline: 2px solid #1E6581;
+    outline-offset: 2px;
+}
+
+.treeview > a:focus {
+    outline: 2px solid #1E6581;
+    outline-offset: 2px;
+}
+
+.modal:focus {
+    outline: none;
+}
+
+.modal-content {
+    outline: 2px solid #1E6581;
+}
+
+@media (prefers-reduced-motion: reduce) {
+    * {
+        animation-duration: 0.01ms !important;
+        animation-iteration-count: 1 !important;
+        transition-duration: 0.01ms !important;
+    }
+}
+
+.sr-only {
+    position: absolute !important;
+    width: 1px !important;
+    height: 1px !important;
+    padding: 0 !important;
+    margin: -1px !important;
+    overflow: hidden !important;
+    clip: rect(0, 0, 0, 0) !important;
+    white-space: nowrap !important;
+    border: 0 !important;
+}
+
 // edit buttons
 .hidden-edit-button {
     cursor: pointer;
diff --git a/resources/views/accounts/create.twig b/resources/views/accounts/create.twig
index c52e127687d..01472f2be16 100644
--- a/resources/views/accounts/create.twig
+++ b/resources/views/accounts/create.twig
@@ -3,6 +3,8 @@
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, objectType) }}
 {% endblock %}
 {% block content %}
+    <h1>{{ ('create_new_' ~ objectType ~ '_account')|_ }}</h1>
+    
     <!-- set location data high up -->
     <script type="text/javascript" nonce="{{ JS_NONCE }}">
         var locations = {{ locations|json_encode|raw }};
diff --git a/resources/views/accounts/delete.twig b/resources/views/accounts/delete.twig
index 29789e35de1..6572d126656 100644
--- a/resources/views/accounts/delete.twig
+++ b/resources/views/accounts/delete.twig
@@ -13,7 +13,7 @@
             <div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12">
                 <div class="box box-danger">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ trans('form.delete_account', {'name': account.name}) }}</h3>
+                        <h1 class="box-title">{{ trans('form.delete_account', {'name': account.name}) }}</h1>
                     </div>
                     <div class="box-body">
                         <p class="text-danger">
diff --git a/resources/views/accounts/edit.twig b/resources/views/accounts/edit.twig
index e5cbdb02663..e75e4aaf3c3 100644
--- a/resources/views/accounts/edit.twig
+++ b/resources/views/accounts/edit.twig
@@ -11,6 +11,8 @@
         var mapboxToken = "{{ config('firefly.mapbox_api_key') }}";
     </script>
 
+    <h1 class="sr-only">{{ ('edit_' ~ objectType ~ '_account')|_ }}</h1>
+
     <form method="post" action="{{ route('accounts.update',account.id) }}" class="form-horizontal"
           accept-charset="UTF-8"
           enctype="multipart/form-data">
@@ -23,7 +25,7 @@
             <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
                 <div class="box box-primary">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
+                        <h2 class="box-title">{{ 'mandatoryFields'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         {{ ExpandedForm.text('name', account.name) }}
@@ -50,7 +52,7 @@
             <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'optionalFields'|_ }}</h3>
+                        <h2 class="box-title">{{ 'optionalFields'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         {{ ExpandedForm.text('iban', account.iban) }}
@@ -87,7 +89,7 @@
                 {% if preFilled.account_role == 'ccAsset' %}
                     <div class="box">
                         <div class="box-header with-border">
-                            <h3 class="box-title">{{ 'credit_card_options'|_ }}</h3>
+                            <h2 class="box-title">{{ 'credit_card_options'|_ }}</h2>
                         </div>
                         <div class="box-body">
                             {{ ExpandedForm.select('cc_type',Config.get('firefly.ccTypes')) }}
@@ -102,7 +104,7 @@
                 {# panel for options  #}
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'options'|_ }}</h3>
+                        <h2 class="box-title">{{ 'options'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         {{ ExpandedForm.optionsList('update','account') }}
diff --git a/resources/views/accounts/index.twig b/resources/views/accounts/index.twig
index e8e12dd7a84..be92973aa51 100644
--- a/resources/views/accounts/index.twig
+++ b/resources/views/accounts/index.twig
@@ -10,9 +10,9 @@
             <div class="col-lg-12 col-md-12 col-sm-12">
                 <div class="box" id="account-index-{{ objectType }}">
                     <div class="box-header with-border">
-                        <h3 class="box-title">
+                        <h1 class="box-title">
                             {{ subTitle }}
-                        </h3>
+                        </h1>
                         <div class="box-tools pull-right">
                             <div class="btn-group">
                                 <button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><span class="fa fa-ellipsis-v"></span></button>
diff --git a/resources/views/accounts/reconcile/index.twig b/resources/views/accounts/reconcile/index.twig
index 5cef87c7afd..1fdf6c01e90 100644
--- a/resources/views/accounts/reconcile/index.twig
+++ b/resources/views/accounts/reconcile/index.twig
@@ -10,14 +10,14 @@
         <div class="col-lg-9 col-md-12 col-sm-12 col-xs-12">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'reconcile_range'|_ }}</h3>
+                    <h1 class="box-title">{{ 'reconcile_range'|_ }}</h1>
                 </div>
                 <div class="box-body no-padding">
-                    <table class="table table-hover">
+                    <table class="table table-hover" aria-label="{{ 'reconcile_balance_table'|_ }}">
                         <thead>
                         <tr>
-                            <th colspan="2" style="width:50%;">{{ 'start_balance'|_ }}</th>
-                            <th colspan="2">{{ 'end_balance'|_ }}</th>
+                            <th colspan="2" style="width:50%;" scope="colgroup">{{ 'start_balance'|_ }}</th>
+                            <th colspan="2" scope="colgroup">{{ 'end_balance'|_ }}</th>
                         </tr>
                         </thead>
                         <tbody>
@@ -92,7 +92,7 @@
         <div class="col-lg-3 col-md-12 col-sm-12 col-xs-12">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'reconcile_options'|_ }}</h3>
+                    <h2 class="box-title">{{ 'reconcile_options'|_ }}</h2>
                 </div>
                 <div class="box-body">
                     <p class="lead" id="difference"></p>
@@ -110,7 +110,7 @@
         <div class="col-lg-12 col-md-12 col-sm-12">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'transactions'|_ }}</h3>
+                    <h2 class="box-title">{{ 'transactions'|_ }}</h2>
                 </div>
                 <div class="box-body">
                     <div id="transactions_holder">
diff --git a/resources/views/accounts/reconcile/overview.twig b/resources/views/accounts/reconcile/overview.twig
index 914a897bf60..9eabdd356a4 100644
--- a/resources/views/accounts/reconcile/overview.twig
+++ b/resources/views/accounts/reconcile/overview.twig
@@ -19,11 +19,18 @@
                     <input type="hidden" name="journals[]" value="{{ id }}"/>
                 {% endfor %}
 
-                <table class="table table-striped table-bordered">
-                    <tr>
-                        <td>{{ 'submitted_start_balance'|_ }} ({{ start.isoFormat(monthAndDayFormat) }})</td>
-                        <td>{{ formatAmountByAccount(account, startBalance) }}</td>
-                    </tr>
+                <table class="table table-striped table-bordered" aria-label="{{ 'reconciliation_summary'|_ }}">
+                    <thead>
+                        <tr>
+                            <th scope="col">{{ 'description'|_ }}</th>
+                            <th scope="col">{{ 'amount'|_ }}</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <tr>
+                            <td>{{ 'submitted_start_balance'|_ }} ({{ start.isoFormat(monthAndDayFormat) }})</td>
+                            <td>{{ formatAmountByAccount(account, startBalance) }}</td>
+                        </tr>
                     <tr>
                         <td>{{ trans('firefly.selected_transactions', {count: selectedIds|length}) }}</td>
                         <td>{{ formatAmountByAccount(account, amount) }}</td>
@@ -49,6 +56,7 @@
                         </td>
 
                     </tr>
+                    </tbody>
                 </table>
                 <p>
                     {% if diffCompare > 0 %}
diff --git a/resources/views/accounts/reconcile/show.twig b/resources/views/accounts/reconcile/show.twig
index bbcaaff3a14..e3324b00342 100644
--- a/resources/views/accounts/reconcile/show.twig
+++ b/resources/views/accounts/reconcile/show.twig
@@ -24,26 +24,26 @@
 
                 </div>
                 <div class="box-body no-padding">
-                    <table class="table table-hover">
+                    <table class="table table-hover" aria-label="{{ 'transaction_journal_information'|_ }}">
                         <tbody>
                         <tr>
-                            <td>{{ trans('list.type') }}</td>
+                            <th scope="row">{{ trans('list.type') }}</th>
                             <td>{{ journal.transactiontype.type|_ }}</td>
                         </tr>
                         <tr>
-                            <td>{{ trans('list.description') }}</td>
+                            <th scope="row">{{ trans('list.description') }}</th>
                             <td>{{ journal.description }}</td>
                         </tr>
                         {# total amount #}
                         <tr>
-                            <td>{{ 'total_amount'|_ }}</td>
+                            <th scope="row">{{ 'total_amount'|_ }}</th>
                             <td>
                                 {{ formatAmountByAccount(transaction.account, transaction.amount) }}
 
                             </td>
                         </tr>
                         <tr>
-                            <td style="width:30%;">{{ trans('list.date') }}</td>
+                            <th scope="row" style="width:30%;">{{ trans('list.date') }}</th>
                             <td>{{ journal.date.isoFormat(monthAndDayFormat) }}</td>
                         </tr>
                         </tbody>
@@ -67,21 +67,21 @@
                     <h3 class="box-title">{{ 'transaction_journal_meta'|_ }}</h3>
                 </div>
                 <div class="box-body no-padding">
-                    <table class="table table-responsive table-hover">
+                    <table class="table table-responsive table-hover" aria-label="{{ 'transaction_journal_meta'|_ }}">
                         <tbody>
                         {#
                         <tr>
-                            <td>{{ 'categories'|_ }}</td>
+                            <th scope="row">{{ 'categories'|_ }}</th>
                             <td>{{ journalCategories(journal)|raw }}</td>
                         </tr>
                         #}
                         {% if journal.tags|length > 0 %}
                             <tr>
-                                <td>{{ 'tags'|_ }}</td>
+                                <th scope="row">{{ 'tags'|_ }}</th>
                                 <td>
                                     {% for tag in journal.tags %}
 
-                                        <h4 style="display: inline;"><a class="label label-success" href="{{ route('tags.show',tag) }}">
+                                        <span style="display: inline;"><a class="label label-success" href="{{ route('tags.show',tag) }}">
                                                 {% if tag.tag_mode == 'nothing' %}
                                                     <span class="fa fa-fw fa-tag"></span>
                                                 {% endif %}
@@ -92,7 +92,7 @@
                                                     <span class="fa fa-fw fa-sort-numeric-desc"></span>
                                                 {% endif %}
                                                 {{ tag.tag }}</a>
-                                        </h4>
+                                        </span>
                                     {% endfor %}
                                 </td>
                             </tr>
diff --git a/resources/views/accounts/reconcile/transactions.twig b/resources/views/accounts/reconcile/transactions.twig
index be9cc0331f6..634e1ce9745 100644
--- a/resources/views/accounts/reconcile/transactions.twig
+++ b/resources/views/accounts/reconcile/transactions.twig
@@ -1,15 +1,15 @@
-<table class="table table-striped table-condensed">
+<table class="table table-striped table-condensed" aria-label="{{ trans('firefly.reconcile_transactions_table') }}">
     <thead>
     <tr class="ignore">
-        <th class="hidden-xs" colspan="2">&nbsp;</th>
-        <th>{{ trans('list.description') }}</th>
-        <th style="text-align:right;">{{ trans('list.amount') }}</th>
-        <th class="hidden-xs hidden-sm hidden-md">{{ trans('list.reconcile') }}</th>
-        <th class="hidden-xs hidden-sm">{{ trans('list.date') }}</th>
-        <th class="hidden-xs hidden-sm hidden-md">{{ trans('list.from') }}</th>
-        <th class="hidden-xs hidden-sm hidden-md">{{ trans('list.to') }}</th>
-        <th class="hidden-xs"><span class="fa fa-pie-chart fa-fw" title="{{ trans('list.budget') }}"></span></th>
-        <th class="hidden-xs"><span class="fa fa-bookmark fa-fw" title="{{ trans('list.category') }}"></span></th>
+        <th class="hidden-xs" colspan="2" scope="col">&nbsp;</th>
+        <th scope="col">{{ trans('list.description') }}</th>
+        <th scope="col" style="text-align:right;">{{ trans('list.amount') }}</th>
+        <th class="hidden-xs hidden-sm hidden-md" scope="col">{{ trans('list.reconcile') }}</th>
+        <th class="hidden-xs hidden-sm" scope="col">{{ trans('list.date') }}</th>
+        <th class="hidden-xs hidden-sm hidden-md" scope="col">{{ trans('list.from') }}</th>
+        <th class="hidden-xs hidden-sm hidden-md" scope="col">{{ trans('list.to') }}</th>
+        <th class="hidden-xs" scope="col"><span class="fa fa-pie-chart fa-fw" title="{{ trans('list.budget') }}" aria-hidden="true"></span><span class="sr-only">{{ trans('list.budget') }}</span></th>
+        <th class="hidden-xs" scope="col"><span class="fa fa-bookmark fa-fw" title="{{ trans('list.category') }}" aria-hidden="true"></span><span class="sr-only">{{ trans('list.category') }}</span></th>
     </tr>
     </thead>
     <tbody>
diff --git a/resources/views/accounts/show.twig b/resources/views/accounts/show.twig
index e2145c14655..166338b8472 100644
--- a/resources/views/accounts/show.twig
+++ b/resources/views/accounts/show.twig
@@ -10,7 +10,7 @@
         <div class="{% if attachments.count() == 0 %}col-lg-12 col-md-12 col-sm-12 col-xs-12{% else %}col-lg-8 col-md-6 col-sm-12 col-xs-12{% endif %}">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">
+                    <h1 class="box-title">
                         {% if balances.balance %}
                         {{ trans('firefly.chart_account_in_period', {
                             balance: formatAmountBySymbol(balances.balance, currency.symbol, currency.decimal_places, true),
@@ -20,7 +20,7 @@
                                 balance: formatAmountBySymbol(balances.pc_balance, primaryCurrency.symbol, primaryCurrency.decimal_places, true),
                                 name: account.name|escape, start: start.isoFormat(monthAndDayFormat), end: end.isoFormat(monthAndDayFormat) })|raw }}
                         {% endif %}
-                    </h3>
+                    </h1>
                     <div class="box-tools pull-right">
                         <div class="btn-group">
                             <button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><span
@@ -48,9 +48,9 @@
             <div class="col-lg-4 col-md-6 col-sm-12 col-xs-12">
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">
+                        <h2 class="box-title">
                             {{ 'attachments'|_ }}
-                        </h3>
+                        </h2>
                     </div>
                     <div class="box-body no-padding">
                         {% include 'list.attachments' %}
@@ -64,7 +64,7 @@
             <div class="col-lg-4 col-md-6 col-sm-12 col-xs-12">
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">pay-off by date</h3>
+                        <h2 class="box-title">pay-off by date</h2>
                     </div>
                     <div class="box-body">
                         Content
@@ -78,7 +78,7 @@
             <div class="col-lg-4 col-md-6 col-sm-12 col-xs-12">
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'expenses_by_category'|_ }}</h3>
+                        <h2 class="box-title">{{ 'expenses_by_category'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         <div style="width:100%;margin:0 auto;">
@@ -90,7 +90,7 @@
             <div class="col-lg-4 col-md-6 col-sm-12 col-xs-12">
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'expenses_by_budget'|_ }}</h3>
+                        <h2 class="box-title">{{ 'expenses_by_budget'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         <div style="width:100%;margin:0 auto;">
@@ -102,7 +102,7 @@
             <div class="col-lg-4 col-md-6 col-sm-12 col-xs-12">
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'income_by_category'|_ }}</h3>
+                        <h2 class="box-title">{{ 'income_by_category'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         <div style="width:100%;margin:0 auto;">
@@ -119,7 +119,7 @@
             <div class="col-lg-6">
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'location'|_ }}</h3>
+                        <h2 class="box-title">{{ 'location'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         <div id="location_map" style="width:100%;height:300px;"></div>
diff --git a/resources/views/attachments/delete.twig b/resources/views/attachments/delete.twig
index d7a790bcdaa..10d3d1e45da 100644
--- a/resources/views/attachments/delete.twig
+++ b/resources/views/attachments/delete.twig
@@ -12,7 +12,7 @@
             <div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12">
                 <div class="box box-danger">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ trans('form.delete_attachment', {'name': attachment.filename}) }}</h3>
+                        <h1 class="box-title">{{ trans('form.delete_attachment', {'name': attachment.filename}) }}</h1>
                     </div>
                     <div class="box-body">
                         <p class="text-danger">
diff --git a/resources/views/attachments/edit.twig b/resources/views/attachments/edit.twig
index 2a8a45c7e13..f1d46bbfc11 100644
--- a/resources/views/attachments/edit.twig
+++ b/resources/views/attachments/edit.twig
@@ -5,6 +5,7 @@
 {% endblock %}
 
 {% block content %}
+    <h1>{{ 'edit_attachment'|_ }}</h1>
     <form method="POST" action="{{ route('attachments.update', attachment.id) }}" accept-charset="UTF-8"
           class="form-horizontal" id="update">
 
@@ -16,7 +17,7 @@
             <div class="col-lg-6 col-md-6 col-sm-12">
                 <div class="box box-primary">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
+                        <h2 class="box-title">{{ 'mandatoryFields'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         {{ ExpandedForm.staticText('filename',attachment.filename|escape) }}
@@ -29,7 +30,7 @@
             <div class="col-lg-6 col-md-6 col-sm-12">
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'optionalFields'|_ }}</h3>
+                        <h2 class="box-title">{{ 'optionalFields'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         {{ ExpandedForm.text('title', attachment.title) }}
@@ -44,7 +45,7 @@
                 {# panel for options #}
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'options'|_ }}</h3>
+                        <h2 class="box-title">{{ 'options'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         {{ ExpandedForm.optionsList('update','attachment') }}
diff --git a/resources/views/attachments/index.twig b/resources/views/attachments/index.twig
index 307c3f18239..137a6909b06 100644
--- a/resources/views/attachments/index.twig
+++ b/resources/views/attachments/index.twig
@@ -9,20 +9,20 @@
         <div class="col-lg-12 col-md-12 col-sm-12">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">
+                    <h1 class="box-title">
                         {{ 'list_all_attachments'|_ }}
-                    </h3>
+                    </h1>
                 </div>
                 <div class="box-body no-padding">
-                    <table class="table table-striped sortable">
+                    <table class="table table-striped sortable" aria-label="{{ 'list_all_attachments'|_ }}">
                         <thead>
                         <tr>
-                            <th data-defaultsign="_19">&nbsp;</th>
-                            <th data-defaultsign="az">{{ trans('list.file_name') }}</th>
-                            <th data-defaultsign="_19">{{ trans('list.file_size') }}</th>
-                            <th data-defaultsign="az">{{ trans('list.file_type') }}</th>
-                            <th data-defaultsign="az">{{ trans('list.attached_to') }}</th>
-                            <th data-defaultsign="_19">{{ trans('list.file_exists') }}</th>
+                            <th data-defaultsign="_19" scope="col">{{ 'actions'|_ }}</th>
+                            <th data-defaultsign="az" scope="col">{{ trans('list.file_name') }}</th>
+                            <th data-defaultsign="_19" scope="col">{{ trans('list.file_size') }}</th>
+                            <th data-defaultsign="az" scope="col">{{ trans('list.file_type') }}</th>
+                            <th data-defaultsign="az" scope="col">{{ trans('list.attached_to') }}</th>
+                            <th data-defaultsign="_19" scope="col">{{ trans('list.file_exists') }}</th>
                         </tr>
                         </thead>
                         <tbody>
diff --git a/resources/views/bills/create.twig b/resources/views/bills/create.twig
index cdab3ccef11..8522bebaa10 100644
--- a/resources/views/bills/create.twig
+++ b/resources/views/bills/create.twig
@@ -6,6 +6,8 @@
 
 {% block content %}
 
+    <h1 class="sr-only">{{ 'create_new_bill'|_ }}</h1>
+
     <form method="POST" action="{{ route('subscriptions.store') }}" accept-charset="UTF-8" class="form-horizontal" id="store" enctype="multipart/form-data">
         <input name="_token" type="hidden" value="{{ csrf_token() }}">
 
@@ -13,7 +15,7 @@
             <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
                 <div class="box box-primary">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
+                        <h2 class="box-title">{{ 'mandatoryFields'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         {{ ExpandedForm.text('name') }}
@@ -30,7 +32,7 @@
             <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'optionalFields'|_ }}</h3>
+                        <h2 class="box-title">{{ 'optionalFields'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         {{ ExpandedForm.date('bill_end_date',null, {'helpText': trans('firefly.bill_end_date_help')}) }}
@@ -49,7 +51,7 @@
                 {# panel for options #}
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'options'|_ }}</h3>
+                        <h2 class="box-title">{{ 'options'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         {{ ExpandedForm.optionsList('create','bill') }}
diff --git a/resources/views/bills/delete.twig b/resources/views/bills/delete.twig
index b0a59c80798..40e098066ef 100644
--- a/resources/views/bills/delete.twig
+++ b/resources/views/bills/delete.twig
@@ -12,7 +12,7 @@
             <div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12">
                 <div class="box box-danger">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ trans('form.delete_bill', {'name': bill.name}) }}</h3>
+                        <h1 class="box-title">{{ trans('form.delete_bill', {'name': bill.name}) }}</h1>
                     </div>
                     <div class="box-body">
                         <p class="text-danger">
diff --git a/resources/views/bills/edit.twig b/resources/views/bills/edit.twig
index 46206470392..a2f52e1ee44 100644
--- a/resources/views/bills/edit.twig
+++ b/resources/views/bills/edit.twig
@@ -6,6 +6,8 @@
 
 {% block content %}
 
+    <h1>{{ 'edit_bill'|_ }}: {{ bill.name }}</h1>
+
     <form method="post" action="{{ route('subscriptions.update', bill.id) }}" class="form-horizontal" accept-charset="UTF-8"
           enctype="multipart/form-data">
         <input type="hidden" name="_token" value="{{ csrf_token() }}"/>
@@ -15,7 +17,7 @@
             <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
                 <div class="box box-primary">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
+                        <h2 class="box-title">{{ 'mandatoryFields'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         {% if rules.count() > 0 %}
@@ -37,7 +39,7 @@
             <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'optionalFields'|_ }}</h3>
+                        <h2 class="box-title">{{ 'optionalFields'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         {{ ExpandedForm.date('bill_end_date',null, {'helpText': trans('firefly.bill_end_date_help')}) }}
@@ -57,7 +59,7 @@
             <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'options'|_ }}</h3>
+                        <h2 class="box-title">{{ 'options'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         {{ ExpandedForm.optionsList('update','bill') }}
diff --git a/resources/views/bills/index.twig b/resources/views/bills/index.twig
index 49a2905d5d0..409459925af 100644
--- a/resources/views/bills/index.twig
+++ b/resources/views/bills/index.twig
@@ -12,7 +12,7 @@
             <div class="col-lg-12 col-sm-12 col-md-12">
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ title }}</h3>
+                        <h1 class="box-title">{{ title }}</h1>
                         <div class="box-tools pull-right">
                             <div class="btn-group">
                                 <button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><span class="fa fa-ellipsis-v"></span></button>
diff --git a/resources/views/bills/show.twig b/resources/views/bills/show.twig
index ec55e972209..ecfcb969e40 100644
--- a/resources/views/bills/show.twig
+++ b/resources/views/bills/show.twig
@@ -10,7 +10,7 @@
         <div class="col-lg-6 col-sm-12 col-md-12">
             <div class="box" id="billInfo">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ object.data.name }}</h3>
+                    <h1 class="box-title">{{ object.data.name }}</h1>
 
                     <div class="box-tools pull-right">
                         <div class="btn-group">
@@ -24,7 +24,8 @@
 
                 </div>
                 <div class="box-body">
-                    <table class="table table-striped">
+                    <table class="table table-striped" aria-label="{{ 'bill_details'|_ }}">
+                        <tbody>
                         <tr>
                             <td colspan="2">
                                 {% set lowAmount  = formatAmountByCurrency(object.data.currency,object.data.amount_min) %}
@@ -42,7 +43,7 @@
                         </tr>
 
                         <tr>
-                            <td style="width:50%;">{{ 'bill_is_active'|_ }}</td>
+                            <th scope="row" style="width:50%;">{{ 'bill_is_active'|_ }}</th>
                             <td>
                                 {% if object.data.active %}
                                     <span class="fa fa-check fa-fw" title="{{ 'active'|_ }}"></span> {{ 'yes'|_ }}
@@ -52,7 +53,7 @@
                             </td>
                         </tr>
                         <tr>
-                            <td>{{ 'next_expected_match'|_ }}</td>
+                            <th scope="row">{{ 'next_expected_match'|_ }}</th>
                             <td>
 
                                 {% if object.data.pay_dates|length > 0 %}
@@ -63,7 +64,7 @@
                             </td>
                         </tr>
                         <tr>
-                            <td>{{ trans('firefly.average_bill_amount_year', {year: year}) }}</td>
+                            <th scope="row">{{ trans('firefly.average_bill_amount_year', {year: year}) }}</th>
                             <td>
                                 {% for avg in yearAverage %}
                                     {{ formatAmountBySymbol(avg.avg, avg.currency_symbol, avg.currency_decimal_places, true) }}
@@ -77,7 +78,7 @@
                             </td>
                         </tr>
                         <tr>
-                            <td>{{ 'average_bill_amount_overall'|_ }}</td>
+                            <th scope="row">{{ 'average_bill_amount_overall'|_ }}</th>
                             <td>
                                 {% for avg in overallAverage %}
                                     {{ formatAmountBySymbol(avg.avg, avg.currency_symbol, avg.currency_decimal_places, true) }}
@@ -89,6 +90,7 @@
                                 {% endfor %}
                             </td>
                         </tr>
+                        </tbody>
                     </table>
                 </div>
                 <div class="box-footer">
@@ -102,7 +104,7 @@
         <div class="col-lg-6 col-sm-12 col-md-12">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'bill_related_rules'|_ }}</h3>
+                    <h2 class="box-title">{{ 'bill_related_rules'|_ }}</h2>
                 </div>
                 <div class="box-body">
                     {% if rules.count() > 0 %}
@@ -133,7 +135,7 @@
             {% if object.data.notes %}
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'notes'|_ }}</h3>
+                        <h2 class="box-title">{{ 'notes'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         {{ object.data.notes|default('')|markdown }}
@@ -145,7 +147,7 @@
             {% if attachments.count() > 0 %}
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'attachments'|_ }}</h3>
+                        <h2 class="box-title">{{ 'attachments'|_ }}</h2>
                     </div>
                     <div class="box-body no-padding">
                         {% include 'list.attachments' %}
@@ -159,7 +161,7 @@
         <div class="col-lg-12 col-sm-12 col-md-12">
             <div class="box" id="billChart">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'chart'|_ }}</h3>
+                    <h2 class="box-title">{{ 'chart'|_ }}</h2>
                 </div>
                 <div class="box-body">
                     <canvas id="bill-overview" style="width:100%;height:400px;" height="400" width="100%"></canvas>
@@ -172,7 +174,7 @@
         <div class="col-lg-12 col-sm-12 col-md-12">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'connected_journals'|_ }}</h3>
+                    <h2 class="box-title">{{ 'connected_journals'|_ }}</h2>
                 </div>
                 <div class="box-body">
                     {% include 'list.groups' %}
diff --git a/resources/views/budgets/budget-limits/create.twig b/resources/views/budgets/budget-limits/create.twig
index 112bd739e7b..922ba7da122 100644
--- a/resources/views/budgets/budget-limits/create.twig
+++ b/resources/views/budgets/budget-limits/create.twig
@@ -3,7 +3,7 @@
         <div class="modal-header">
             <button type="button" class="close" data-dismiss="modal"><span>&times;</span><span class="sr-only">{{ 'close'|_ }}</span>
             </button>
-            <h4 class="modal-title">
+            <h4 class="modal-title" id="budgetLimitModalTitle">
                 {{ trans('firefly.set_budget_limit_title',
                     {start: start.isoFormat(monthAndDayFormat), end: end.isoFormat(monthAndDayFormat), budget: budget.name}) }}
             </h4>
diff --git a/resources/views/budgets/budget-limits/show.twig b/resources/views/budgets/budget-limits/show.twig
index 783c81fd302..5bf2c52d3bb 100644
--- a/resources/views/budgets/budget-limits/show.twig
+++ b/resources/views/budgets/budget-limits/show.twig
@@ -3,9 +3,9 @@
         <div class="modal-header">
             <button type="button" class="close" data-dismiss="modal"><span>&times;</span><span class="sr-only">{{ 'close'|_ }}</span>
             </button>
-            <h4 class="modal-title">
+            <h2 class="modal-title">
                 {{ trans('firefly.set_budget_limit_notes') }}
-            </h4>
+            </h2>
         </div>
             <div class="modal-body">
                 <div>
diff --git a/resources/views/budgets/create.twig b/resources/views/budgets/create.twig
index fd1e014b485..f41e4ef87e0 100644
--- a/resources/views/budgets/create.twig
+++ b/resources/views/budgets/create.twig
@@ -6,6 +6,8 @@
 
 {% block content %}
 
+    <h1>{{ 'create_new_budget'|_ }}</h1>
+
     <form method="POST" action="{{ route('budgets.store') }}" accept-charset="UTF-8" class="form-horizontal" id="store" enctype="multipart/form-data">
         <input name="_token" type="hidden" value="{{ csrf_token() }}">
         <input name="active" type="hidden" value="1">
@@ -14,7 +16,7 @@
             <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
                 <div class="box box-primary">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
+                        <h2 class="box-title">{{ 'mandatoryFields'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         {{ ExpandedForm.text('name') }}
@@ -25,7 +27,7 @@
                 {# panel for auto-budget #}
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'optionalFields'|_ }}</h3>
+                        <h2 class="box-title">{{ 'optionalFields'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         {{ ExpandedForm.select('auto_budget_type', autoBudgetTypes,null, {helpText: trans('firefly.auto_budget_help')}) }}
@@ -42,7 +44,7 @@
                 {# panel for options #}
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'options'|_ }}</h3>
+                        <h2 class="box-title">{{ 'options'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         {{ ExpandedForm.optionsList('create','budget') }}
diff --git a/resources/views/budgets/delete.twig b/resources/views/budgets/delete.twig
index 36976d17b24..f1403c21194 100644
--- a/resources/views/budgets/delete.twig
+++ b/resources/views/budgets/delete.twig
@@ -13,7 +13,7 @@
             <div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12">
                 <div class="box box-danger">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ trans('form.delete_budget', {'name': budget.name}) }}</h3>
+                        <h1 class="box-title">{{ trans('form.delete_budget', {'name': budget.name}) }}</h1>
                     </div>
                     <div class="box-body">
                         <p class="text-danger">
diff --git a/resources/views/budgets/edit.twig b/resources/views/budgets/edit.twig
index ebe8d604b78..f47e4c12d41 100644
--- a/resources/views/budgets/edit.twig
+++ b/resources/views/budgets/edit.twig
@@ -13,7 +13,7 @@
             <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
                 <div class="box box-primary">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
+                        <h2 class="box-title">{{ 'mandatoryFields'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         {# only correct way to do active checkbox #}
@@ -27,7 +27,7 @@
                 {# panel for auto-budget #}
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'optionalFields'|_ }}</h3>
+                        <h2 class="box-title">{{ 'optionalFields'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         {{ ExpandedForm.select('auto_budget_type', autoBudgetTypes, autoBudget.auto_budget_type) }}
@@ -45,7 +45,7 @@
                 {# panel for options #}
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'options'|_ }}</h3>
+                        <h2 class="box-title">{{ 'options'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         {{ ExpandedForm.optionsList('update','budget') }}
diff --git a/resources/views/budgets/index.twig b/resources/views/budgets/index.twig
index d7739488748..9f61524f330 100644
--- a/resources/views/budgets/index.twig
+++ b/resources/views/budgets/index.twig
@@ -10,7 +10,7 @@
         <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'budget_period_navigator'|_ }}</h3>
+                    <h2 class="box-title">{{ 'budget_period_navigator'|_ }}</h2>
                 </div>
                 <div class="box-body">
                     <div class="row" id="periodNavigator">
@@ -54,11 +54,11 @@
             <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">
+                        <h2 class="box-title">
                             {{ trans('firefly.total_available_budget_in_currency', {currency: primaryCurrency.name}) }}
                             <br>
                             <small>{{ trans('firefly.between_dates_breadcrumb', {start: start.isoFormat(monthAndDayFormat), end: end.isoFormat(monthAndDayFormat)}) }}</small>
-                        </h3>
+                        </h2>
                     </div>
                     <div class="box-body">
                         <div class="row">
@@ -103,11 +103,11 @@
                 <div class="col-lg-{{ boxSize }} col-md-12 col-sm-12 col-xs-12">
                     <div class="box">
                         <div class="box-header with-border">
-                            <h3 class="box-title">
+                            <h2 class="box-title">
                                 {{ trans('firefly.total_available_budget_in_currency', {currency: budget.transaction_currency.name}) }}
                                 <br>
                                 <small>{{ trans('firefly.between_dates_breadcrumb', {start: budget.start_date.isoFormat(monthAndDayFormat), end: budget.end_date.isoFormat(monthAndDayFormat)}) }}</small>
-                            </h3>
+                            </h2>
                         </div>
                         <div class="box-body">
                             <div class="row">
@@ -204,20 +204,20 @@
             <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'budgets'|_ }}</h3>
+                        <h1 class="box-title">{{ 'budgets'|_ }}</h1>
                     </div>
                     <div class="box-body no-padding">
                         <div style="padding:8px;">
                             <a href="{{ route('budgets.create') }}" class="btn btn-success"><span class="fa fa-plus fa-fw"></span> {{ 'createBudget'|_ }}</a>
                         </div>
-                        <table class="table table-bordered sortable-table table-striped sortable" id="budgetList">
+                        <table class="table table-bordered sortable-table table-striped sortable" id="budgetList" aria-label="{{ 'budgets_table'|_ }}">
                             <thead>
                             <tr>
-                                <th class="hidden-sm hidden-xs" style="width:10%;">&nbsp;</th>
-                                <th>{{ 'budget'|_ }}</th>
-                                <th style="width:25%;">{{ 'budgeted'|_ }}</th>
-                                <th class="hidden-sm hidden-xs">{{ 'spent'|_ }} ({{ 'per_day'|_|lower }})</th>
-                                <th>{{ 'left'|_ }} ({{ 'per_day'|_|lower }})</th>
+                                <th class="hidden-sm hidden-xs" style="width:10%;" scope="col">&nbsp;</th>
+                                <th scope="col">{{ 'budget'|_ }}</th>
+                                <th style="width:25%;" scope="col">{{ 'budgeted'|_ }}</th>
+                                <th class="hidden-sm hidden-xs" scope="col">{{ 'spent'|_ }} ({{ 'per_day'|_|lower }})</th>
+                                <th scope="col">{{ 'left'|_ }} ({{ 'per_day'|_|lower }})</th>
                             </tr>
                             </thead>
                             <tbody>
diff --git a/resources/views/budgets/no-budget.twig b/resources/views/budgets/no-budget.twig
index ac5fcf44ccd..dc6b06298ee 100644
--- a/resources/views/budgets/no-budget.twig
+++ b/resources/views/budgets/no-budget.twig
@@ -19,7 +19,7 @@
         <div class="{% if periods|length > 0 %}col-lg-9 col-md-9 col-sm-12{% else %}col-lg-12 col-md-12 col-sm-12{% endif %}">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ subTitle }}</h3>
+                    <h1 class="box-title">{{ subTitle }}</h1>
                 </div>
                 <div class="box-body ">
 
diff --git a/resources/views/budgets/show.twig b/resources/views/budgets/show.twig
index 8f3c53aefaf..903527fb8e3 100644
--- a/resources/views/budgets/show.twig
+++ b/resources/views/budgets/show.twig
@@ -5,17 +5,22 @@
 {% endblock %}
 
 {% block content %}
+    <div class="row">
+        <div class="col-lg-12">
+            <h1 class="sr-only">{{ 'budget_details'|_ }}: {{ budget.name }}</h1>
+        </div>
+    </div>
     <div class="row">
         <div class="{% if attachments.count() == 0 %}col-lg-12 col-md-12 col-sm-12 col-xs-12{% else %}col-lg-8 col-md-6 col-sm-12 col-xs-12{% endif %}">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">
+                    <h2 class="box-title">
                         {% if budgetLimit %}
                             {{ trans('firefly.chart_budget_in_period', {name: budget.name, start: budgetLimit.start_date.isoFormat(monthAndDayFormat), end: budgetLimit.end_date.isoFormat(monthAndDayFormat),currency: budgetLimit.transactionCurrency.name }) }}
                         {% else %}
                             {{ trans('firefly.chart_all_journals_for_budget', {name:budget.name}) }}
                         {% endif %}
-                    </h3>
+                    </h2>
                     <div class="box-tools pull-right">
                         <div class="btn-group">
                             <button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><span class="fa fa-ellipsis-v"></span></button>
@@ -42,9 +47,9 @@
             <div class="col-lg-4 col-md-6 col-sm-12 col-xs-12">
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">
+                        <h2 class="box-title">
                             {{ 'attachments'|_ }}
-                        </h3>
+                        </h2>
                     </div>
                     <div class="box-body no-padding">
                         {% include 'list.attachments' %}
@@ -57,7 +62,7 @@
         <div class="col-lg-4 col-md-6 col-sm-12 col-xs-12">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'expenses_by_category'|_ }}</h3>
+                    <h2 class="box-title">{{ 'expenses_by_category'|_ }}</h2>
                 </div>
                 <div class="box-body">
                     <div style="width:100%;margin:0 auto;">
@@ -76,7 +81,7 @@
         <div class="col-lg-4 col-md-6 col-sm-12 col-xs-12">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'expenses_by_asset_account'|_ }}</h3>
+                    <h2 class="box-title">{{ 'expenses_by_asset_account'|_ }}</h2>
                 </div>
                 <div class="box-body">
                     <div style="width:100%;margin:0 auto;">
@@ -95,7 +100,7 @@
         <div class="col-lg-4 col-md-6 col-sm-12 col-xs-12">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'expenses_by_expense_account'|_ }}</h3>
+                    <h2 class="box-title">{{ 'expenses_by_expense_account'|_ }}</h2>
                 </div>
                 <div class="box-body">
                     <div style="width:100%;margin:0 auto;">
@@ -125,7 +130,7 @@
 
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'transactions'|_ }}</h3>
+                    <h2 class="box-title">{{ 'transactions'|_ }}</h2>
                 </div>
                 <div class="box-body">
                     {% include 'list.groups' %}
@@ -153,9 +158,16 @@
                             </h3>
                         </div>
                         <div class="box-body no-padding">
-                            <table class="table table-hover">
+                            <table class="table table-hover" aria-label="{{ 'budget_limit_details'|_ }}">
+                                <thead class="sr-only">
+                                    <tr>
+                                        <th scope="col">{{ 'description'|_ }}</th>
+                                        <th scope="col">{{ 'amount'|_ }}</th>
+                                    </tr>
+                                </thead>
+                                <tbody>
                                 <tr>
-                                    <td style="width:33%;">{{ 'amount'|_ }}</td>
+                                    <th scope="row" style="width:33%;">{{ 'amount'|_ }}</th>
                                     <td>
                                         {{ formatAmountBySymbol(limit.amount, limit.transactionCurrency.symbol, limit.transactionCurrency.decimal_places) }}
                                         {% if convertToPrimary and null != limit.native_amount %}
@@ -164,7 +176,7 @@
                                     </td>
                                 </tr>
                                 <tr>
-                                    <td style="width:33%;">{{ 'spent'|_ }}</td>
+                                    <th scope="row" style="width:33%;">{{ 'spent'|_ }}</th>
                                     <td>
                                         {% if convertToPrimary %}
                                             {{ formatAmountBySymbol(limit.spent, limit.transactionCurrency.symbol, limit.transactionCurrency.decimal_places) }}
@@ -201,6 +213,7 @@
                                         </td>
                                     </tr>
                                 {% endif %}
+                                </tbody>
                             </table>
                         </div>
                     </div>
diff --git a/resources/views/categories/delete.twig b/resources/views/categories/delete.twig
index 1c2a9836b1b..6af706d55c8 100644
--- a/resources/views/categories/delete.twig
+++ b/resources/views/categories/delete.twig
@@ -12,7 +12,7 @@
             <div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12">
                 <div class="box box-danger">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ trans('form.delete_category', {'name': category.name}) }}</h3>
+                        <h1 class="box-title">{{ trans('form.delete_category', {'name': category.name}) }}</h1>
                     </div>
                     <div class="box-body">
                         <p class="text-danger">
diff --git a/resources/views/categories/edit.twig b/resources/views/categories/edit.twig
index aa9b6263d67..903325446af 100644
--- a/resources/views/categories/edit.twig
+++ b/resources/views/categories/edit.twig
@@ -5,6 +5,7 @@
 {% endblock %}
 
 {% block content %}
+    <h1>{{ 'edit_category'|_ }}: {{ category.name }}</h1>
 
     <form method="post" action="{{ route('categories.update',category.id) }}" class="form-horizontal"
           accept-charset="UTF-8"
@@ -16,7 +17,7 @@
             <div class="col-lg-6 col-md-6 col-sm-12">
                 <div class="box box-primary">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
+                        <h2 class="box-title">{{ 'mandatoryFields'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         {{ ExpandedForm.text('name', category.name) }}
@@ -27,7 +28,7 @@
                 {# panel for optional fields #}
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'optionalFields'|_ }}</h3>
+                        <h2 class="box-title">{{ 'optionalFields'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         {{ ExpandedForm.textarea('notes', preFilled.notes, {helpText: trans('firefly.field_supports_markdown')} ) }}
@@ -43,7 +44,7 @@
                 {# panel for options #}
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'options'|_ }}</h3>
+                        <h2 class="box-title">{{ 'options'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         {{ ExpandedForm.optionsList('update','category') }}
diff --git a/resources/views/categories/index.twig b/resources/views/categories/index.twig
index cefb5c0df2f..126a7a3d48e 100644
--- a/resources/views/categories/index.twig
+++ b/resources/views/categories/index.twig
@@ -10,7 +10,7 @@
             <div class="col-lg-12 col-md-12 col-sm-12">
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'categories'|_ }}</h3>
+                        <h1 class="box-title">{{ 'categories'|_ }}</h1>
                         <div class="box-tools pull-right">
                             <div class="btn-group">
                                 <button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><span class="fa fa-ellipsis-v"></span></button>
diff --git a/resources/views/categories/no-category.twig b/resources/views/categories/no-category.twig
index 7dde51d679e..f98a3e325ae 100644
--- a/resources/views/categories/no-category.twig
+++ b/resources/views/categories/no-category.twig
@@ -19,7 +19,7 @@
         <div class="{% if periods|length > 0 %}col-lg-10 col-md-9 col-sm-12 col-xs-12{% else %}col-lg-12 col-md-12 col-sm-12 col-xs-12{% endif %}">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ subTitle }}</h3>
+                    <h1 class="box-title">{{ subTitle }}</h1>
                 </div>
                 <div class="box-body ">
 
diff --git a/resources/views/categories/show.twig b/resources/views/categories/show.twig
index 5a8563356e5..d90ed78c25f 100644
--- a/resources/views/categories/show.twig
+++ b/resources/views/categories/show.twig
@@ -5,15 +5,16 @@
 {% endblock %}
 
 {% block content %}
+    <h1 class="sr-only">{{ 'category_details'|_ }}: {{ category.name }}</h1>
     <div class="row">
         {% if Route.getCurrentRoute.getName == 'categories.show' %}
             {# both charts #}
             <div class="{% if attachments.count() == 0 %}col-lg-6 col-md-12 col-sm-12 col-xs-12{% else %}col-lg-4 col-md-12 col-sm-12 col-xs-12{% endif %}">
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">
+                        <h2 class="box-title">
                             {{ trans('firefly.chart_category_in_period', {name: category.name, start: start.isoFormat(monthAndDayFormat), end: end.isoFormat(monthAndDayFormat) }) }}
-                        </h3>
+                        </h2>
                     </div>
                     <div class="box-body">
                         <canvas id="specific-period" style="width:100%;height:400px;" height="400" width="100%"></canvas>
@@ -23,9 +24,9 @@
             <div class="{% if attachments.count() == 0 %}col-lg-6 col-md-12 col-sm-12 col-xs-12{% else %}col-lg-4 col-md-12 col-sm-12 col-xs-12{% endif %}">
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">
+                        <h2 class="box-title">
                             {{ trans('firefly.chart_category_all', {name: category.name }) }}
-                        </h3>
+                        </h2>
                     </div>
                     <div class="box-body">
                         <canvas id="category-everything" style="width:100%;height:400px;" height="400" width="100%"></canvas>
@@ -38,9 +39,9 @@
             <div class="{% if attachments.count() == 0 %}col-lg-12 col-md-12 col-sm-12 col-xs-12{% else %}col-lg-8 col-md-12 col-sm-12 col-xs-12{% endif %}">
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">
+                        <h2 class="box-title">
                             {{ trans('firefly.chart_category_all', {name: category.name }) }}
-                        </h3>
+                        </h2>
                     </div>
                     <div class="box-body">
                         <canvas id="category-everything" style="width:100%;height:400px;" height="400" width="100%"></canvas>
@@ -52,9 +53,9 @@
             <div class="col-lg-4 col-md-12 col-sm-12 col-xs-12">
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">
+                        <h2 class="box-title">
                             {{ 'attachments'|_ }}
-                        </h3>
+                        </h2>
                     </div>
                     <div class="box-body no-padding">
                         {% include 'list.attachments' %}
@@ -76,7 +77,7 @@
 
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'transactions'|_ }}</h3>
+                    <h2 class="box-title">{{ 'transactions'|_ }}</h2>
                 </div>
                 <div class="box-body">
                     {% if periods|length > 0 %}
diff --git a/resources/views/currencies/create.twig b/resources/views/currencies/create.twig
index 619ab2d2122..d8832ee9a1a 100644
--- a/resources/views/currencies/create.twig
+++ b/resources/views/currencies/create.twig
@@ -11,7 +11,7 @@
             <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
                 <div class="box box-primary">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
+                        <h2 class="box-title">{{ 'mandatoryFields'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         {{ ExpandedForm.text('name',null,{'maxlength' : 48}) }}
@@ -29,7 +29,7 @@
                 {# panel for options #}
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'options'|_ }}</h3>
+                        <h2 class="box-title">{{ 'options'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         {{ ExpandedForm.optionsList('create','currency') }}
diff --git a/resources/views/currencies/delete.twig b/resources/views/currencies/delete.twig
index 4a2dfb5e76e..e8d72031606 100644
--- a/resources/views/currencies/delete.twig
+++ b/resources/views/currencies/delete.twig
@@ -12,7 +12,7 @@
             <div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12">
                 <div class="box box-danger">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ trans('form.delete_currency', {'name': currency.name}) }}</h3>
+                        <h1 class="box-title">{{ trans('form.delete_currency', {'name': currency.name}) }}</h1>
                     </div>
                     <div class="box-body">
                         <p class="text-danger">
diff --git a/resources/views/currencies/edit.twig b/resources/views/currencies/edit.twig
index 053891d8252..c0e38040065 100644
--- a/resources/views/currencies/edit.twig
+++ b/resources/views/currencies/edit.twig
@@ -15,7 +15,7 @@
             <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
                 <div class="box box-primary">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
+                        <h2 class="box-title">{{ 'mandatoryFields'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         {{ ExpandedForm.text('name', currency.name,{'maxlength' : 48}) }}
@@ -33,7 +33,7 @@
                 {# panel for options #}
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'options'|_ }}</h3>
+                        <h2 class="box-title">{{ 'options'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         {{ ExpandedForm.optionsList('update','currency') }}
diff --git a/resources/views/currencies/index.twig b/resources/views/currencies/index.twig
index c05c82ea207..968117d97e7 100644
--- a/resources/views/currencies/index.twig
+++ b/resources/views/currencies/index.twig
@@ -9,7 +9,7 @@
         <div class="col-lg-12 col-sm-12 col-md-12">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'currencies'|_ }}</h3>
+                    <h1 class="box-title">{{ 'currencies'|_ }}</h1>
                     <a class="btn btn-success pull-right" href="{{ route('currencies.create') }}">{{ 'create_currency'|_ }}</a>
                 </div>
                 <div class="box-body">
@@ -22,12 +22,12 @@
                         <div style="padding-left:8px;">
                             {{ currencies.links('pagination.bootstrap-4')|raw }}
                         </div>
-                        <table class="table table-hover">
+                        <table class="table table-hover" aria-label="{{ 'currencies_table'|_ }}">
                             <thead>
                             <tr>
-                                <th>&nbsp;</th>
-                                <th>{{ 'currency'|_ }}</th>
-                                <th>{{ 'number_of_decimals'|_ }}</th>
+                                <th scope="col">{{ 'actions'|_ }}</th>
+                                <th scope="col">{{ 'currency'|_ }}</th>
+                                <th scope="col">{{ 'number_of_decimals'|_ }}</th>
                             </tr>
                             </thead>
                             <tbody>
diff --git a/resources/views/error.twig b/resources/views/error.twig
index 05f883edf07..cea7a56c9c2 100644
--- a/resources/views/error.twig
+++ b/resources/views/error.twig
@@ -4,7 +4,7 @@
 
     <div class="row">
         <div class="col-lg-12 col-md-12 col-sm-12">
-            <h3 class="text-danger">Sorry, an error occurred.</h3>
+            <h1 class="text-danger">Sorry, an error occurred.</h1>
         </div>
     </div>
 
diff --git a/resources/views/errors/500.blade.php b/resources/views/errors/500.blade.php
index 14bfb0c5fca..4a80cfe54a6 100644
--- a/resources/views/errors/500.blade.php
+++ b/resources/views/errors/500.blade.php
@@ -19,16 +19,16 @@
     @if(!($debug ?? false))
         <div class="row">
             <div class="col">
-                <h4>
+                <h2>
                     {{ trans('errors.more_info') }}
-                </h4>
+                </h2>
                 <p>
                     {!! trans('errors.collect_info')  !!}
                     {!! trans('errors.collect_info_more')  !!}
                 </p>
-                <h4>
+                <h2>
                     {{ trans('errors.github_help') }}
-                </h4>
+                </h2>
                 <p>
                     {!! trans('errors.github_instructions') !!}
                 </p>
@@ -45,13 +45,13 @@
     @if($debug ?? false)
         <div class="row">
             <div class="col">
-                <h4>{{ trans('errors.error') }}</h4>
+                <h2>{{ trans('errors.error') }}</h2>
                 <p>
                     {!! trans('errors.error_location', ['file' => $exception->getFile(), 'line' =>  $exception->getLine(), 'code' => $exception->getCode() ]) !!}
                 </p>
-                <h4>
+                <h2>
                     {{ trans('errors.stacktrace') }}
-                </h4>
+                </h2>
                 <div style="font-family: monospace;font-size:11px;">
                     {!!  nl2br($exception->getTraceAsString())  !!}
                 </div>
diff --git a/resources/views/errors/DatabaseException.blade.php b/resources/views/errors/DatabaseException.blade.php
index ae65ae5fdf3..739764118ce 100644
--- a/resources/views/errors/DatabaseException.blade.php
+++ b/resources/views/errors/DatabaseException.blade.php
@@ -19,16 +19,16 @@
     @if(!$debug)
         <div class="row">
             <div class="col">
-                <h4>
+                <h2>
                     {{ trans('errors.more_info') }}
-                </h4>
+                </h2>
                 <p>
                     {!! trans('errors.collect_info')  !!}
                     {!! trans('errors.collect_info_more')  !!}
                 </p>
-                <h4>
+                <h2>
                     {{ trans('errors.github_help') }}
-                </h4>
+                </h2>
                 <p>
                     {!! trans('errors.github_instructions') !!}
                 </p>
@@ -45,13 +45,13 @@
     @if($debug)
         <div class="row">
             <div class="col">
-                <h4>{{ trans('errors.error') }}</h4>
+                <h2>{{ trans('errors.error') }}</h2>
                 <p>
                     {!! trans('errors.error_location', ['file' => $exception->getFile(), 'line' =>  $exception->getLine(), 'code' => $exception->getCode() ]) !!}
                 </p>
-                <h4>
+                <h3>
                     {{ trans('errors.stacktrace') }}
-                </h4>
+                </h3>
                 <div style="font-family: monospace;font-size:11px;">
                     {!!  nl2br($exception->getTraceAsString())  !!}
                 </div>
diff --git a/resources/views/errors/FireflyException.blade.php b/resources/views/errors/FireflyException.blade.php
index 5dfc2be6c8d..773e5614f60 100644
--- a/resources/views/errors/FireflyException.blade.php
+++ b/resources/views/errors/FireflyException.blade.php
@@ -19,16 +19,16 @@
     @if(!$debug)
         <div class="row">
             <div class="col">
-                <h4>
+                <h2>
                     {{ trans('errors.more_info') }}
-                </h4>
+                </h2>
                 <p>
                     {!! trans('errors.collect_info')  !!}
                     {!! trans('errors.collect_info_more')  !!}
                 </p>
-                <h4>
+                <h2>
                     {{ trans('errors.github_help') }}
-                </h4>
+                </h2>
                 <p>
                     {!! trans('errors.github_instructions') !!}
                 </p>
@@ -45,13 +45,13 @@
     @if($debug)
         <div class="row">
             <div class="col">
-                <h4>{{ trans('errors.error') }}</h4>
+                <h2>{{ trans('errors.error') }}</h2>
                 <p>
                     {!! trans('errors.error_location', ['file' => $exception->getFile(), 'line' =>  $exception->getLine(), 'code' => $exception->getCode() ]) !!}
                 </p>
-                <h4>
+                <h3>
                     {{ trans('errors.stacktrace') }}
-                </h4>
+                </h3>
                 <div style="font-family: monospace;font-size:11px;">
                     {!!  nl2br($exception->getTraceAsString())  !!}
                 </div>
diff --git a/resources/views/export/index.twig b/resources/views/export/index.twig
index 35490f14a3b..822da43f6a6 100644
--- a/resources/views/export/index.twig
+++ b/resources/views/export/index.twig
@@ -9,7 +9,7 @@
         <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
             <div class="box box-primary">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'export_data_main_title'|_ }}</h3>
+                    <h1 class="box-title">{{ 'export_data_main_title'|_ }}</h1>
                 </div>
                 <div class="box-body">
                     <p>
diff --git a/resources/views/form/checkbox.twig b/resources/views/form/checkbox.twig
index 7e64d02030b..5002293407b 100644
--- a/resources/views/form/checkbox.twig
+++ b/resources/views/form/checkbox.twig
@@ -9,7 +9,7 @@
     <div class="{% if options.small %}col-sm-4{% else %}col-sm-8{% endif %}">
         <div class="checkbox">
             <label>
-                {{ Html.checkbox(name, options.checked, value).id(options.id) }}
+                {{ Html.checkbox(name, options.checked, value).id(options.id).attribute('aria-describedby', (options.helpText ? name ~ '_help' : '') ~ (errors.has(name) ? ' ' ~ name ~ '_error' : '')).attribute('aria-invalid', errors.has(name) ? 'true' : 'false').attribute('aria-required', options.required ? 'true' : 'false') }}
             </label>
         </div>
         {% include 'form.help' %}
diff --git a/resources/views/form/date.twig b/resources/views/form/date.twig
index 68a14ecd646..d190c72ce12 100644
--- a/resources/views/form/date.twig
+++ b/resources/views/form/date.twig
@@ -5,10 +5,10 @@
     <div class="col-sm-8">
         <div class="input-group">
             <div class="input-group-addon">
-                <span class="fa fa-calendar"></span>
+                <span class="fa fa-calendar" aria-hidden="true"></span>
             </div>
             {{ Html.input('date', name, value).id(options.id).class('form-control').attribute('autocomplete','off').attribute('spellcheck','false')
-            .attribute('min', options.min)
+            .attribute('min', options.min).attribute('aria-describedby', (options.helpText ? name ~ '_help' : '') ~ (errors.has(name) ? ' ' ~ name ~ '_error' : '')).attribute('aria-invalid', errors.has(name) ? 'true' : 'false').attribute('aria-required', options.required ? 'true' : 'false')
             }}
         </div>
         {% include 'form.help' %}
diff --git a/resources/views/form/feedback.twig b/resources/views/form/feedback.twig
index 64d5875b838..55985cded3a 100644
--- a/resources/views/form/feedback.twig
+++ b/resources/views/form/feedback.twig
@@ -1,4 +1,4 @@
 {% if errors.has(name) %}
     <span class="form-control-feedback"><span class="fa fa-fw fa-remove"></span></span>
-    <p class="text-danger">{{ errors.first(name) }}</p>
+    <p class="text-danger" id="{{ name }}_error" role="alert">{{ errors.first(name) }}</p>
 {% endif %}
diff --git a/resources/views/form/file.twig b/resources/views/form/file.twig
index b45a4606bb1..9d586945a1e 100644
--- a/resources/views/form/file.twig
+++ b/resources/views/form/file.twig
@@ -2,7 +2,7 @@
     <label for="{{ options.id }}" class="col-sm-4 control-label">{{ label }}</label>
 
     <div class="col-sm-8">
-        {{ Html.input('file',name).id(options.id).attribute('multiple','multiple').class('form-control') }}
+        {{ Html.input('file',name).id(options.id).attribute('multiple','multiple').class('form-control').attribute('aria-describedby', (options.helpText ? name ~ '_help' : '') ~ (errors.has(name) ? ' ' ~ name ~ '_error' : '')).attribute('aria-invalid', errors.has(name) ? 'true' : 'false').attribute('aria-required', options.required ? 'true' : 'false') }}
         {% include 'form.help' %}
         {% include 'form.feedback' %}
     </div>
diff --git a/resources/views/form/help.twig b/resources/views/form/help.twig
index d402fb623b6..33c9e87b333 100644
--- a/resources/views/form/help.twig
+++ b/resources/views/form/help.twig
@@ -1,3 +1,3 @@
 {% if options.helpText %}
-    <p class="help-block">{{ options.helpText|raw }}</p>
+    <p class="help-block" id="{{ name }}_help">{{ options.helpText|raw }}</p>
 {% endif %}
diff --git a/resources/views/form/integer.twig b/resources/views/form/integer.twig
index 924e339d6ca..c470c92175a 100644
--- a/resources/views/form/integer.twig
+++ b/resources/views/form/integer.twig
@@ -2,7 +2,7 @@
     <label for="{{ options.id }}" class="col-sm-4 control-label">{{ label }}</label>
 
     <div class="col-sm-8">
-        {{ Html.input('number', name, value).id(options.id).attribute('step',options.step).attribute('autocomplete','off').attribute('spellcheck', 'false').class('form-control').attribute('placeholder',options.placeholder) }}
+        {{ Html.input('number', name, value).id(options.id).attribute('step',options.step).attribute('autocomplete','off').attribute('spellcheck', 'false').class('form-control').attribute('placeholder',options.placeholder).attribute('aria-describedby', (options.helpText ? name ~ '_help' : '') ~ (errors.has(name) ? ' ' ~ name ~ '_error' : '')).attribute('aria-invalid', errors.has(name) ? 'true' : 'false').attribute('aria-required', options.required ? 'true' : 'false') }}
         {% include 'form.help' %}
         {% include 'form.feedback' %}
     </div>
diff --git a/resources/views/form/multi-select.twig b/resources/views/form/multi-select.twig
index d21a4734b67..ee436e41671 100644
--- a/resources/views/form/multi-select.twig
+++ b/resources/views/form/multi-select.twig
@@ -2,7 +2,7 @@
     <label for="{{ options.id }}" class="col-sm-4 control-label">{{ label }}</label>
 
     <div class="col-sm-8">
-        {{ Html.multiselect(name~"[]", list, selected).id(options.id).attribute('size',12).class('form-control').attribute('autocomplete','off').attribute('spellcheck','false').attribute('placeholder', options.placeholder) }}
+        {{ Html.multiselect(name~"[]", list, selected).id(options.id).attribute('size',12).class('form-control').attribute('autocomplete','off').attribute('spellcheck','false').attribute('placeholder', options.placeholder).attribute('aria-describedby', (options.helpText ? name ~ '_help' : '') ~ (errors.has(name) ? ' ' ~ name ~ '_error' : '')).attribute('aria-invalid', errors.has(name) ? 'true' : 'false').attribute('aria-required', options.required ? 'true' : 'false') }}
         {% include 'form.help' %}
         {% include 'form.feedback' %}
 
diff --git a/resources/views/form/password.twig b/resources/views/form/password.twig
index 7524a4bb2bc..1ea981ff512 100644
--- a/resources/views/form/password.twig
+++ b/resources/views/form/password.twig
@@ -2,7 +2,7 @@
     <label for="{{ options.id }}" class="col-sm-4 control-label">{{ label }}</label>
 
     <div class="col-sm-8">
-        {{ Html.input('password', name, value).id(options.id).class('form-control').attribute('placeholder',options.placeholder).attribute('autocomplete','off').attribute('spellcheck','false') }}
+        {{ Html.input('password', name, value).id(options.id).class('form-control').attribute('placeholder',options.placeholder).attribute('autocomplete','off').attribute('spellcheck','false').attribute('aria-describedby', (options.helpText ? name ~ '_help' : '') ~ (errors.has(name) ? ' ' ~ name ~ '_error' : '')).attribute('aria-invalid', errors.has(name) ? 'true' : 'false').attribute('aria-required', options.required ? 'true' : 'false') }}
         {% include 'form.help' %}
         {% include 'form.feedback' %}
     </div>
diff --git a/resources/views/form/percentage.twig b/resources/views/form/percentage.twig
index d22ca11c17c..fcdcb844290 100644
--- a/resources/views/form/percentage.twig
+++ b/resources/views/form/percentage.twig
@@ -3,7 +3,7 @@
 
     <div class="col-sm-8">
         <div class="input-group">
-            {{ Html.input('number', name, value).id(options.id).attribute('step',options.step).attribute('autocomplete','off').attribute('spellcheck', 'false').class('form-control').attribute('placeholder',options.placeholder) }}
+            {{ Html.input('number', name, value).id(options.id).attribute('step',options.step).attribute('autocomplete','off').attribute('spellcheck', 'false').class('form-control').attribute('placeholder',options.placeholder).attribute('aria-describedby', (options.helpText ? name ~ '_help' : '') ~ (errors.has(name) ? ' ' ~ name ~ '_error' : '')).attribute('aria-invalid', errors.has(name) ? 'true' : 'false').attribute('aria-required', options.required ? 'true' : 'false') }}
             <div class="input-group-addon">%</div>
         </div>
         {% include 'form.help' %}
diff --git a/resources/views/form/select.twig b/resources/views/form/select.twig
index bbd5588aec0..736f4aa3231 100644
--- a/resources/views/form/select.twig
+++ b/resources/views/form/select.twig
@@ -2,7 +2,7 @@
     <label for="{{ options.id }}" class="col-sm-4 control-label">{{ label }}</label>
 
     <div class="col-sm-8">
-        {{ Html.select(name, list, selected).id(options.id).class('form-control').attribute('autocomplete','off').attribute('spellcheck','false').attribute('placeholder', options.placeholder) }}
+        {{ Html.select(name, list, selected).id(options.id).class('form-control').attribute('autocomplete','off').attribute('spellcheck','false').attribute('placeholder', options.placeholder).attribute('aria-describedby', (options.helpText ? name ~ '_help' : '') ~ (errors.has(name) ? ' ' ~ name ~ '_error' : '')).attribute('aria-invalid', errors.has(name) ? 'true' : 'false').attribute('aria-required', options.required ? 'true' : 'false') }}
         {% include 'form.help' %}
         {% include 'form.feedback' %}
 
diff --git a/resources/views/form/text.twig b/resources/views/form/text.twig
index e1a9e3e3413..339ba292cbb 100644
--- a/resources/views/form/text.twig
+++ b/resources/views/form/text.twig
@@ -2,7 +2,7 @@
     <label for="{{ options.id }}" class="col-sm-4 control-label">{{ label }}</label>
 
     <div class="col-sm-8">
-        {{ Html.input('text', name, value).id(options.id).class('form-control').attribute('autocomplete','off').attribute('spellcheck','false').attribute('placeholder',options.placeholder) }}
+        {{ Html.input('text', name, value).id(options.id).class('form-control').attribute('autocomplete','off').attribute('spellcheck','false').attribute('placeholder',options.placeholder).attribute('aria-describedby', (options.helpText ? name ~ '_help' : '') ~ (errors.has(name) ? ' ' ~ name ~ '_error' : '')).attribute('aria-invalid', errors.has(name) ? 'true' : 'false').attribute('aria-required', options.required ? 'true' : 'false') }}
         {% include 'form.help' %}
         {% include 'form.feedback' %}
     </div>
diff --git a/resources/views/form/textarea.twig b/resources/views/form/textarea.twig
index d8f647db298..76a4bcb2712 100644
--- a/resources/views/form/textarea.twig
+++ b/resources/views/form/textarea.twig
@@ -2,7 +2,7 @@
     <label for="{{ options.id }}" class="col-sm-4 control-label">{{ label }}</label>
 
     <div class="col-sm-8">
-        {{ Html.textarea(name, value).id(options.id).attribute('rows', options.rows).class('form-control').attribute('autocomplete','off').attribute('spellcheck','false').attribute('placeholder',options.placeholder) }}
+        {{ Html.textarea(name, value).id(options.id).attribute('rows', options.rows).class('form-control').attribute('autocomplete','off').attribute('spellcheck','false').attribute('placeholder',options.placeholder).attribute('aria-describedby', (options.helpText ? name ~ '_help' : '') ~ (errors.has(name) ? ' ' ~ name ~ '_error' : '')).attribute('aria-invalid', errors.has(name) ? 'true' : 'false').attribute('aria-required', options.required ? 'true' : 'false') }}
         {% include 'form.help' %}
         {% include 'form.feedback' %}
     </div>
diff --git a/resources/views/index.twig b/resources/views/index.twig
index ec0655f809f..a481980927b 100644
--- a/resources/views/index.twig
+++ b/resources/views/index.twig
@@ -4,6 +4,7 @@
     {{ Breadcrumbs.render }}
 {% endblock %}
 {% block content %}
+    <h1 class="sr-only">{{ 'dashboard'|_ }}</h1>
     {% include 'partials.boxes' %}
     <div class="row">
         <div class="col-lg-8 col-md-12 col-sm-12">
diff --git a/resources/views/layout/default.twig b/resources/views/layout/default.twig
index a20ed1b0600..196f99163b3 100644
--- a/resources/views/layout/default.twig
+++ b/resources/views/layout/default.twig
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="{{ trans('config.html_language') }}">
+<html lang="{{ trans('config.html_language') }}" dir="ltr">
 <head>
     <!--
     If the base href URL begins with "http://" but you are sure it should start with "https://",
@@ -93,9 +93,13 @@
 
 </head>
 <body class="skin-firefly-iii sidebar-mini hold-transition">
+<div class="skip-links">
+    <a href="#main-content" class="skip-links">{{ 'skip_to_content'|_ }}</a>
+    <a href="#main-navigation" class="skip-links">{{ 'skip_to_navigation'|_ }}</a>
+</div>
 <div class="wrapper" id="app">
 
-    <header class="main-header">
+    <header class="main-header" role="banner">
 
         {# Logo #}
         <a href="{{ route('index') }}" class="logo">
@@ -105,8 +109,8 @@
             <span class="logo-lg"><strong>Firefly</strong>III</span>
         </a>
 
-        <nav class="navbar navbar-static-top" role="navigation">
-            <a href="#" class="sidebar-toggle" data-toggle="push-menu" role="button">
+        <nav class="navbar navbar-static-top" role="navigation" aria-label="{{ 'main_navigation'|_ }}">
+            <a href="#" class="sidebar-toggle" data-toggle="push-menu" role="button" aria-expanded="false" aria-controls="main-navigation">
                 <span class="sr-only">{{ 'toggleNavigation'|_ }}</span>
             </a>
             <div class="navbar-custom-menu">
@@ -139,7 +143,7 @@
 
         </nav>
     </header>
-    <aside class="main-sidebar">
+    <aside class="main-sidebar" role="complementary">
         <section class="sidebar">
             <form action="{{ route('search.index') }}" method="get" class="sidebar-form">
                 <div class="input-group">
@@ -154,7 +158,7 @@
         </section>
     </aside>
 
-    <div class="content-wrapper">
+    <div class="content-wrapper" role="main" id="main-content">
         <section class="content-header">
             {% include('partials.page-header') %}
             {% block breadcrumbs %}{% endblock %}
@@ -176,7 +180,7 @@
             {% block content %}{% endblock %}
         </section>
     </div>
-    <footer class="main-footer">
+    <footer class="main-footer" role="contentinfo">
         <div class="pull-right">
             <b class="hidden-xs">{{ 'version'|_ }}</b> <a
                 href="{{ route('debug') }}">{{ Config.get('firefly.version') }}</a>
@@ -190,10 +194,10 @@
     {% include('partials.control-bar') %}
 
 </div>
-<div class="modal fade" id="defaultModal" tabindex="-1" role="dialog">
+<div class="modal fade" id="defaultModal" tabindex="-1" role="dialog" aria-hidden="true">
 </div>
 
-<div class="modal fade" tabindex="-1" role="dialog" id="helpModal">
+<div class="modal fade" tabindex="-1" role="dialog" id="helpModal" aria-labelledby="helpTitle" aria-hidden="true">
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-header">
@@ -247,6 +251,7 @@
 {# Firefly III code #}
 <script type="text/javascript" src="v1/js/ff/firefly.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
 <script type="text/javascript" src="v1/js/ff/help.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
+<script type="text/javascript" src="v2/js/accessibility.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
 {% if not shownDemo %}
     <script type="text/javascript" nonce="{{ JS_NONCE }}">
         var routeForTour = "{{ current_route_name }}";
@@ -280,7 +285,7 @@
     </script>
     <noscript><p><img
                 src="//{{ config('firefly.tracker_url') }}/matomo.php?idsite={{ config('firefly.tracker_site_id') }}&amp;rec=1"
-                style="border:0;" alt=""/></p></noscript>
+                style="border:0;" alt="Matomo tracking pixel"/></p></noscript>
 {% endif %}
 
 <form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
diff --git a/resources/views/list/accounts.twig b/resources/views/list/accounts.twig
index c7168fcd265..413f5d8b65c 100644
--- a/resources/views/list/accounts.twig
+++ b/resources/views/list/accounts.twig
@@ -1,36 +1,36 @@
 <div style="padding-left:8px;">
     {{ accounts.links('pagination.bootstrap-4')|raw }}
 </div>
-<table class="table table-responsive table-hover" id="sortable-table">
+<table class="table table-responsive table-hover" id="sortable-table" aria-label="{{ trans('list.accounts_table') }}">
     <thead>
     <tr>
-        <th class="hidden-sm hidden-xs">&nbsp;</th>
-        <th>{{ trans('list.name') }}</th>
+        <th scope="col" class="hidden-sm hidden-xs">&nbsp;</th>
+        <th scope="col">{{ trans('list.name') }}</th>
         {% if objectType == 'asset' %}
-            <th class="hidden-sm hidden-xs hidden-md">{{ trans('list.role') }}</th>
+            <th scope="col" class="hidden-sm hidden-xs hidden-md">{{ trans('list.role') }}</th>
         {% endif %}
         {% if objectType == 'liabilities' %}
-            <th>{{ trans('list.liability_type') }}</th>
-            <th>{{ trans('form.liability_direction') }}</th>
-            <th>{{ trans('list.interest') }} ({{ trans('list.interest_period') }})</th>
+            <th scope="col">{{ trans('list.liability_type') }}</th>
+            <th scope="col">{{ trans('form.liability_direction') }}</th>
+            <th scope="col">{{ trans('list.interest') }} ({{ trans('list.interest_period') }})</th>
         {% endif %}
-        <th class="hidden-sm hidden-xs">{{ trans('form.account_number') }}</th>
+        <th scope="col" class="hidden-sm hidden-xs">{{ trans('form.account_number') }}</th>
         {% if objectType != 'liabilities' %}
-            <th style="text-align: right;">{{ trans('list.currentBalance') }}</th>
+            <th scope="col" style="text-align: right;">{{ trans('list.currentBalance') }}</th>
         {% endif %}
         {% if objectType == 'liabilities' %}
-            <th style="text-align: right;">
+            <th scope="col" style="text-align: right;">
                 {{ trans('firefly.left_in_debt') }}
             </th>
         {% endif %}
-        <th class="hidden-sm hidden-xs">{{ trans('list.active') }}</th>
+        <th scope="col" class="hidden-sm hidden-xs">{{ trans('list.active') }}</th>
         {# hide last activity to make room for other stuff #}
         {% if objectType != 'liabilities' %}
-            <th class="hidden-sm hidden-xs hidden-md">{{ trans('list.lastActivity') }}</th>
+            <th scope="col" class="hidden-sm hidden-xs hidden-md">{{ trans('list.lastActivity') }}</th>
         {% endif %}
-        <th style="width:15%;"
+        <th scope="col" style="width:15%;"
             class="hidden-sm hidden-xs hidden-md">{{ trans('list.balanceDiff') }}</th>
-        <th class="hidden-sm hidden-xs">&nbsp;</th>
+        <th scope="col" class="hidden-sm hidden-xs">&nbsp;</th>
     </tr>
     </thead>
     <tbody>
diff --git a/resources/views/list/ale.twig b/resources/views/list/ale.twig
index 7be50457b07..623a69e599e 100644
--- a/resources/views/list/ale.twig
+++ b/resources/views/list/ale.twig
@@ -1,4 +1,12 @@
-<table class="table" aria-label="Table">
+<table class="table" aria-label="{{ 'audit_log_entries'|_ }}">
+    <thead>
+        <tr>
+            <th scope="col" style="width:20%;">{{ 'changer'|_ }}</th>
+            <th scope="col" style="width:30%;">{{ 'action'|_ }}</th>
+            <th scope="col">{{ 'details'|_ }}</th>
+        </tr>
+    </thead>
+    <tbody>
     {% for logEntry in logEntries %}
         <tr>
             <th style="width:20%;" scope="row">
@@ -103,4 +111,5 @@
 
         </tr>
     {% endfor %}
+    </tbody>
 </table>
diff --git a/resources/views/list/attachments.twig b/resources/views/list/attachments.twig
index e67e669062a..950a3219ceb 100644
--- a/resources/views/list/attachments.twig
+++ b/resources/views/list/attachments.twig
@@ -1,4 +1,11 @@
-<table class="table table-responsive table-hover">
+<table class="table table-responsive table-hover" aria-label="{{ 'attachments_list'|_ }}">
+    <thead class="sr-only">
+        <tr>
+            <th scope="col">{{ 'actions'|_ }}</th>
+            <th scope="col">{{ 'attachment'|_ }}</th>
+        </tr>
+    </thead>
+    <tbody>
     {% for attachment in attachments %}
         <tr>
             <td style="width:120px;">
@@ -44,4 +51,5 @@
             </td>
         </tr>
     {% endfor %}
+    </tbody>
 </table>
diff --git a/resources/views/list/bills.twig b/resources/views/list/bills.twig
index e326f77c993..f48f9843a7d 100644
--- a/resources/views/list/bills.twig
+++ b/resources/views/list/bills.twig
@@ -1,17 +1,17 @@
 <div style="padding-left:8px;">
     {{ paginator.links('pagination.bootstrap-4')|raw }}
 </div>
-<table class="table table-responsive table-hover" id="bill-sortable">
+<table class="table table-responsive table-hover" id="bill-sortable" aria-label="{{ 'bills_table'|_ }}">
     <thead>
     <tr>
-        <th class="hidden-sm hidden-xs">&nbsp;</th>
-        <th class="hidden-sm hidden-xs">&nbsp;</th>
-        <th>{{ trans('list.name') }}</th>
-        <th class="hidden-sm hidden-md hidden-xs">{{ trans('list.linked_to_rules') }}</th>
-        <th style="text-align: right;">{{ trans('list.matchingAmount') }}</th>
-        <th class="hidden-sm hidden-xs">{{ trans('list.paid_current_period') }}</th>
-        <th class="hidden-sm hidden-xs">{{ trans('list.next_expected_match') }}</th>
-        <th class="hidden-sm hidden-xs">{{ trans('list.repeat_freq') }}</th>
+        <th class="hidden-sm hidden-xs" scope="col"><span class="sr-only">{{ 'drag_handle'|_ }}</span></th>
+        <th class="hidden-sm hidden-xs" scope="col"><span class="sr-only">{{ 'actions'|_ }}</span></th>
+        <th scope="col">{{ trans('list.name') }}</th>
+        <th class="hidden-sm hidden-md hidden-xs" scope="col">{{ trans('list.linked_to_rules') }}</th>
+        <th style="text-align: right;" scope="col">{{ trans('list.matchingAmount') }}</th>
+        <th class="hidden-sm hidden-xs" scope="col">{{ trans('list.paid_current_period') }}</th>
+        <th class="hidden-sm hidden-xs" scope="col">{{ trans('list.next_expected_match') }}</th>
+        <th class="hidden-sm hidden-xs" scope="col">{{ trans('list.repeat_freq') }}</th>
     </tr>
     </thead>
     {% for objectGroupOrder, objectGroup in bills %}
diff --git a/resources/views/list/categories.twig b/resources/views/list/categories.twig
index 81686e662d9..53658098aa7 100644
--- a/resources/views/list/categories.twig
+++ b/resources/views/list/categories.twig
@@ -1,12 +1,12 @@
 <div style="padding-left:8px;">
     {{ categories.links('pagination.bootstrap-4')|raw }}
 </div>
-<table class="table table-hover sortable">
+<table class="table table-hover sortable" aria-label="{{ 'categories_table'|_ }}">
     <thead>
     <tr>
-        <th data-defaultsort="disabled">&nbsp;</th>
-        <th data-defaultsign="az">{{ trans('list.name') }}</th>
-        <th data-defaultsign="month" class="hidden-sm hidden-xs">{{ trans('list.lastActivity') }}</th>
+        <th data-defaultsort="disabled" scope="col">&nbsp;</th>
+        <th data-defaultsign="az" scope="col">{{ trans('list.name') }}</th>
+        <th data-defaultsign="month" class="hidden-sm hidden-xs" scope="col">{{ trans('list.lastActivity') }}</th>
     </tr>
     </thead>
     <tbody>
diff --git a/resources/views/list/groups.twig b/resources/views/list/groups.twig
index 460462e6847..cebb427b0ea 100644
--- a/resources/views/list/groups.twig
+++ b/resources/views/list/groups.twig
@@ -1,4 +1,4 @@
-<table class="table table-condensed table-hover table-responsive">
+<table class="table table-condensed table-hover table-responsive" role="table" aria-label="{{ 'transaction_list'|_ }}">
     <thead>
     <tr>
         {% if showCategory or showBudget %}
@@ -30,23 +30,23 @@
         </td>
     </tr>
     <tr>
-        <th class="hidden-xs">&nbsp;</th>
-        <th>{{ trans('list.description') }}</th>
-        <th>{{ trans('list.amount') }}</th>
+        <th class="hidden-xs" scope="col">&nbsp;</th>
+        <th scope="col">{{ trans('list.description') }}</th>
+        <th scope="col">{{ trans('list.amount') }}</th>
         {% if config('firefly.feature_flags.running_balance_column') %}
-        <th>{{ trans('list.running_balance') }}</th>
+        <th scope="col">{{ trans('list.running_balance') }}</th>
         {% endif %}
-        <th>{{ trans('list.date') }}</th>
-        <th>{{ trans('list.source_account') }}</th>
-        <th>{{ trans('list.destination_account') }}</th>
+        <th scope="col">{{ trans('list.date') }}</th>
+        <th scope="col">{{ trans('list.source_account') }}</th>
+        <th scope="col">{{ trans('list.destination_account') }}</th>
         {% if showCategory %}
-            <th class="hidden-xs">{{ trans('list.category') }}</th>
+            <th class="hidden-xs" scope="col">{{ trans('list.category') }}</th>
         {% endif %}
         {% if showBudget %}
-            <th class="hidden-xs">{{ trans('list.budget') }}</th>
+            <th class="hidden-xs" scope="col">{{ trans('list.budget') }}</th>
         {% endif %}
-        <th class="hidden-xs">&nbsp;</th><!-- actions -->
-        <th class="hidden-xs">&nbsp;</th><!-- checkbox -->
+        <th class="hidden-xs" scope="col">{{ 'actions'|_ }}</th>
+        <th class="hidden-xs" scope="col">{{ 'select'|_ }}</th>
     </tr>
     </thead>
     <tbody>
diff --git a/resources/views/list/periods.twig b/resources/views/list/periods.twig
index 0f19ef75258..ce2946dda71 100644
--- a/resources/views/list/periods.twig
+++ b/resources/views/list/periods.twig
@@ -1,11 +1,18 @@
 {% for period in periods %}
     <div class="box box-default">
         <div class="box-header with-border">
-            <h3 class="box-title"><a href="{{ period.route }}">{{ period.title }}</a>
+            <h3 class="box-title" id="period-{{ loop.index }}"><a href="{{ period.route }}" aria-describedby="period-{{ loop.index }}">{{ period.title }}</a>
             </h3>
         </div>
         <div class="box-body no-padding">
-            <table class="table table-hover">
+            <table class="table table-hover" aria-label="{{ 'period_summary_table'|_ }}">
+                <thead class="sr-only">
+                    <tr>
+                        <th scope="col">{{ 'transaction_type'|_ }}</th>
+                        <th scope="col">{{ 'amount'|_ }}</th>
+                    </tr>
+                </thead>
+                <tbody>
                 {% if period.total_transactions > 0 %}
                     <tr>
                         <td style="width:33%;">{{ 'transactions'|_ }}</td>
@@ -88,6 +95,7 @@
                         </tr>
                     {% endif %}
                 {% endfor %}
+                </tbody>
             </table>
         </div>
     </div>
diff --git a/resources/views/list/piggy-bank-events.twig b/resources/views/list/piggy-bank-events.twig
index a1f36c50b5c..d2f4838f5d2 100644
--- a/resources/views/list/piggy-bank-events.twig
+++ b/resources/views/list/piggy-bank-events.twig
@@ -1,11 +1,14 @@
-<table class="table table-hover table-responsive">
-    <tr>
-        {% if showPiggyBank %}
-            <th>{{ trans('list.piggy_bank') }}</th>
-        {% endif %}
-        <th>{{ trans('list.date') }}</th>
-        <th>{{ trans('list.amount') }}</th>
-    </tr>
+<table class="table table-hover table-responsive" aria-label="{{ trans('list.piggy_bank_events') }}">
+    <thead>
+        <tr>
+            {% if showPiggyBank %}
+                <th scope="col">{{ trans('list.piggy_bank') }}</th>
+            {% endif %}
+            <th scope="col">{{ trans('list.date') }}</th>
+            <th scope="col">{{ trans('list.amount') }}</th>
+        </tr>
+    </thead>
+    <tbody>
     {% for event in events %}
         <tr>
             {% if showPiggyBank %}
@@ -31,4 +34,5 @@
             </td>
         </tr>
     {% endfor %}
+    </tbody>
 </table>
diff --git a/resources/views/list/piggy-banks.twig b/resources/views/list/piggy-banks.twig
index 01dd93ec6e8..e1fe6ae6a4d 100644
--- a/resources/views/list/piggy-banks.twig
+++ b/resources/views/list/piggy-banks.twig
@@ -1,13 +1,13 @@
-<table class="table table-hover table-condensed" id="piggy-sortable">
+<table class="table table-hover table-condensed" id="piggy-sortable" aria-label="{{ 'piggy_banks_table'|_ }}">
     <thead>
     <tr>
-        <th colspan="2">&nbsp;</th>
-        <th>{{ 'piggy_bank'|_ }}</th>
-        <th style="text-align: right;">{{ 'saved_so_far'|_ }}</th>
-        <th colspan="3" class="hidden-sm hidden-xs">&nbsp;</th>
-        <th style="text-align: right;" class="hidden-sm hidden-xs">{{ 'target_amount'|_ }}</th>
-        <th style="text-align: right;" class="hidden-sm hidden-xs">{{ 'left_to_save'|_ }}</th>
-        <th style="text-align: right;" class="hidden-sm hidden-xs">{{ 'suggested_savings_per_month'|_ }}</th>
+        <th scope="col" colspan="2">{{ 'actions'|_ }}</th>
+        <th scope="col">{{ 'piggy_bank'|_ }}</th>
+        <th scope="col" style="text-align: right;">{{ 'saved_so_far'|_ }}</th>
+        <th scope="col" colspan="3" class="hidden-sm hidden-xs">{{ 'progress_actions'|_ }}</th>
+        <th scope="col" style="text-align: right;" class="hidden-sm hidden-xs">{{ 'target_amount'|_ }}</th>
+        <th scope="col" style="text-align: right;" class="hidden-sm hidden-xs">{{ 'left_to_save'|_ }}</th>
+        <th scope="col" style="text-align: right;" class="hidden-sm hidden-xs">{{ 'suggested_savings_per_month'|_ }}</th>
     </tr>
     </thead>
 
diff --git a/resources/views/new-user/index.twig b/resources/views/new-user/index.twig
index 627c511dd0f..dd863528560 100644
--- a/resources/views/new-user/index.twig
+++ b/resources/views/new-user/index.twig
@@ -14,7 +14,7 @@
 
                 <div class="box box-primary">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'getting_started'|_ }}</h3>
+                        <h1 class="box-title">{{ 'getting_started'|_ }}</h1>
                     </div>
                     <div class="box-body">
                         <p>
diff --git a/resources/views/object-groups/delete.twig b/resources/views/object-groups/delete.twig
index 8516f869b83..3507a4dbc46 100644
--- a/resources/views/object-groups/delete.twig
+++ b/resources/views/object-groups/delete.twig
@@ -12,7 +12,7 @@
             <div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12">
                 <div class="box box-danger">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ trans('form.delete_object_group', {'title': objectGroup.title}) }}</h3>
+                        <h1 class="box-title">{{ trans('form.delete_object_group', {'title': objectGroup.title}) }}</h1>
                     </div>
                     <div class="box-body">
                         <p class="text-danger">
diff --git a/resources/views/object-groups/edit.twig b/resources/views/object-groups/edit.twig
index d6d52e29c6c..9f78ac6f70b 100644
--- a/resources/views/object-groups/edit.twig
+++ b/resources/views/object-groups/edit.twig
@@ -5,6 +5,7 @@
 {% endblock %}
 
 {% block content %}
+    <h1>{{ 'edit_object_group'|_ }}</h1>
     <form method="post" action="{{ route('object-groups.update',objectGroup.id) }}" class="form-horizontal"
           accept-charset="UTF-8"
           enctype="multipart/form-data">
@@ -16,7 +17,7 @@
             <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
                 <div class="box box-primary">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
+                        <h2 class="box-title">{{ 'mandatoryFields'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         {{ ExpandedForm.text('title', objectGroup.title) }}
@@ -30,7 +31,7 @@
                 {# panel for options #}
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'options'|_ }}</h3>
+                        <h2 class="box-title">{{ 'options'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         {{ ExpandedForm.optionsList('update','object group') }}
diff --git a/resources/views/object-groups/index.twig b/resources/views/object-groups/index.twig
index 80402c7423e..021b888ee66 100644
--- a/resources/views/object-groups/index.twig
+++ b/resources/views/object-groups/index.twig
@@ -8,7 +8,7 @@
         <div class="col-lg-12 col-md-12 col-sm-12">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'object_groups'|_ }}</h3>
+                    <h1 class="box-title">{{ 'object_groups'|_ }}</h1>
                 </div>
                 {% if objectGroups|length == 0 %}
                     <div class="box-body">
@@ -23,15 +23,15 @@
                 {% endif %}
                 {% if objectGroups|length > 0 %}
                     <div class="box-body no-padding">
-                        <table class="table table-condensed" id="sortable">
+                        <table class="table table-condensed" id="sortable" aria-label="{{ 'object_groups'|_ }}">
                             <thead>
                             <tr>
-                                <th>&nbsp;</th>
-                                <th>
+                                <th scope="col">{{ 'sort_handle'|_ }}</th>
+                                <th scope="col">
                                     {{ 'object_group_title'|_ }}
                                 </th>
-                                <th>
-                                    &nbsp;
+                                <th scope="col">
+                                    {{ 'actions'|_ }}
                                 </th>
                             </tr>
                             </thead>
diff --git a/resources/views/partials/debug-table.twig b/resources/views/partials/debug-table.twig
index 6dd268a04e2..419645b0b7e 100644
--- a/resources/views/partials/debug-table.twig
+++ b/resources/views/partials/debug-table.twig
@@ -1,11 +1,11 @@
-<table>
+<table aria-label="System information">
     <thead>
     <tr>
         <th colspan="2">System information</th>
     </tr>
     <tr>
-        <th>Item</th>
-        <th>Value</th>
+        <th scope="col">Item</th>
+        <th scope="col">Value</th>
     </tr>
     </thead>
     <tbody>
@@ -51,14 +51,14 @@
     {% endif %}
     </tbody>
 </table>
-<table>
+<table aria-label="Firefly III information">
     <thead>
     <tr>
         <th colspan="2">Firefly III information</th>
     </tr>
     <tr>
-        <th>Item</th>
-        <th>Value</th>
+        <th scope="col">Item</th>
+        <th scope="col">Value</th>
     </tr>
     </thead>
     <tbody>
@@ -125,14 +125,14 @@
     </tbody>
 </table>
 
-<table>
+<table aria-label="User-specific information">
     <thead>
     <tr>
         <th colspan="2">User-specific information</th>
     </tr>
     <tr>
-        <th>Item</th>
-        <th>Value</th>
+        <th scope="col">Item</th>
+        <th scope="col">Value</th>
     </tr>
     </thead>
     <tbody>
diff --git a/resources/views/partials/menu-sidebar.twig b/resources/views/partials/menu-sidebar.twig
index 5b262fc05d0..f14fa912d8e 100644
--- a/resources/views/partials/menu-sidebar.twig
+++ b/resources/views/partials/menu-sidebar.twig
@@ -1,4 +1,4 @@
-<ul class="sidebar-menu" data-widget="tree">
+<ul class="sidebar-menu" data-widget="tree" id="main-navigation" role="navigation" aria-label="{{ 'sidebar_navigation'|_ }}">
     <li class="{{ activeRouteStrict('index') }}">
         <a href="{{ route('index') }}">
             <em class="fa fa-dashboard fa-fw"></em>
@@ -39,7 +39,7 @@
     <li class="header text-uppercase">{{ 'accounting'|_ }}</li>
 
     <li class="{{ activeRoutePartial('transactions') }} treeview" id="transaction-menu">
-        <a href="#">
+        <a href="#" aria-expanded="false" aria-controls="transactions-submenu">
             <em class="fa fa-exchange fa-fw"></em>
             <span>{{ 'transactions'|_ }}</span>
             <span class="pull-right-container">
@@ -47,7 +47,7 @@
       </span>
         </a>
 
-        <ul class="treeview-menu">
+        <ul class="treeview-menu" id="transactions-submenu">
             <li class="{{ activeRoutePartialObjectType('transactions', 'withdrawal') }}">
                 <a href="{{ route('transactions.index', ['withdrawal']) }}">
                     <span class="fa fa-angle-right fa-fw"></span>
@@ -70,7 +70,7 @@
     </li>
 
     <li class="{{ activeRoutePartial('recurring') }} {{ activeRoutePartial('rules') }} treeview">
-        <a href="#">
+        <a href="#" aria-expanded="false" aria-controls="automation-submenu">
             <em class="fa fa-microchip fa-fw"></em>
             <span>{{ 'automation'|_ }}</span>
             <span class="pull-right-container">
@@ -78,7 +78,7 @@
       </span>
         </a>
 
-        <ul class="treeview-menu">
+        <ul class="treeview-menu" id="automation-submenu">
             <li class="{{ activeRoutePartial('rules') }}">
                 <a href="{{ route('rules.index') }}">
                     <span class="fa fa-angle-right fa-fw"></span>
@@ -112,7 +112,7 @@
     <li class="header text-uppercase">{{ 'others'|_ }}</li>
 
     <li class="{{ activeRoutePartial('accounts') }} treeview" id="account-menu">
-        <a href="#">
+        <a href="#" aria-expanded="false" aria-controls="accounts-submenu">
             <em class="fa fa-credit-card fa-fw"></em>
             <span>{{ 'accounts'|_ }}</span>
             <span class="pull-right-container">
@@ -120,7 +120,7 @@
       </span>
         </a>
 
-        <ul class="treeview-menu">
+        <ul class="treeview-menu" id="accounts-submenu">
             <li class="{{ activeRoutePartialObjectType('accounts', 'asset') }}">
                 <a href="{{ route('accounts.index', ['asset']) }}">
                     <span class="fa fa-angle-right fa-fw"></span>
@@ -149,7 +149,7 @@
     </li>
 
     <li class="{{ activeRoutePartial('categories') }} {{ activeRoutePartial('tags') }} {{ activeRoutePartial('groups') }} treeview">
-        <a href="#">
+        <a href="#" aria-expanded="false" aria-controls="classification-submenu">
             <em class="fa fa-tags fa-fw"></em>
             <span>{{ 'classification'|_ }}</span>
             <span class="pull-right-container">
@@ -157,7 +157,7 @@
       </span>
         </a>
 
-        <ul class="treeview-menu">
+        <ul class="treeview-menu" id="classification-submenu">
             <li class="{{ activeRoutePartial('categories') }}">
                 <a href="{{ route('categories.index') }}">
                     <span class="fa fa-angle-right fa-fw"></span>
@@ -198,7 +198,7 @@
 
     <li class="{{ activeRoutePartial('administrations') }} {{ activeRoutePartial('setting') }} {{ activeRoutePartial('profile') }} {{ activeRoutePartial('preferences') }} {{ activeRoutePartial('currencies') }} {{ activeRoutePartial('exchange-rates') }} treeview"
         id="option-menu">
-        <a href="#">
+        <a href="#" aria-expanded="false" aria-controls="options-submenu">
             <em class="fa fa-sliders fa-fw"></em>
             <span>{{ 'options'|_ }}</span>
             <span class="pull-right-container">
@@ -206,7 +206,7 @@
       </span>
         </a>
 
-        <ul class="treeview-menu">
+        <ul class="treeview-menu" id="options-submenu">
             <li class="{{ activeRoutePartial('profile') }}">
                 <a class="{{ activeRouteStrict('profile.index') }}" href="{{ route('profile.index') }}">
                     <span class="fa fa-angle-right fa-fw"></span>
diff --git a/resources/views/partials/old-password-modal.twig b/resources/views/partials/old-password-modal.twig
index 1bda60cdfd5..2a10125fda1 100644
--- a/resources/views/partials/old-password-modal.twig
+++ b/resources/views/partials/old-password-modal.twig
@@ -1,15 +1,15 @@
-<div class="modal fade" id="passwordModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+<div class="modal fade" id="passwordModal" tabindex="-1" role="dialog" aria-labelledby="passwordModalTitle" aria-describedby="passwordModalBody" aria-hidden="true">
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-header">
-                <h5 class="modal-title">
+                <h5 class="modal-title" id="passwordModalTitle">
                     {{ 'secure_pw_title'|_ }}
                 </h5>
                 <button type="button" class="close" data-dismiss="modal" aria-label="{{ 'close'|_ }}">
                     <span aria-hidden="true">&times;</span>
                 </button>
             </div>
-            <div class="modal-body">
+            <div class="modal-body" id="passwordModalBody">
                 <p>
                     {{ 'secure_pw_history'|_ }}
                 </p>
@@ -20,11 +20,11 @@
                     {{ 'secure_pw_check_box'|_ }}
                 </p>
 
-                <h4>{{ 'secure_pw_working_title'|_ }}</h4>
+                <h6>{{ 'secure_pw_working_title'|_ }}</h6>
                 <p>
                     {{ 'secure_pw_working'|_ }}
                 </p>
-                <h4>{{ 'secure_pw_should'|_ }}</h4>
+                <h6>{{ 'secure_pw_should'|_ }}</h6>
                 <p>
                     {{ 'secure_pw_long_password'|_ }}
                 </p>
diff --git a/resources/views/partials/password-modal-twig.twig b/resources/views/partials/password-modal-twig.twig
index f8365acc9a1..7e0787e774c 100644
--- a/resources/views/partials/password-modal-twig.twig
+++ b/resources/views/partials/password-modal-twig.twig
@@ -1,13 +1,13 @@
-<div class="modal fade" id="passwordModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+<div class="modal fade" id="passwordModal" tabindex="-1" role="dialog" aria-labelledby="passwordModalTitle" aria-describedby="passwordModalBody" aria-hidden="true">
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-header">
-                <h5 class="modal-title">
+                <h5 class="modal-title" id="passwordModalTitle">
                     {{ __('firefly.secure_pw_title') }}
                 </h5>
                 <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="{{ __('firefly.close') }}"></button>
             </div>
-            <div class="modal-body">
+            <div class="modal-body" id="passwordModalBody">
                 <p>
                     {{ __('firefly.secure_pw_history') }}
                 </p>
@@ -18,11 +18,11 @@
                     {{ __('firefly.secure_pw_check_box') }}
                 </p>
 
-                <h4>{{ __('firefly.secure_pw_working_title') }}</h4>
+                <h6>{{ __('firefly.secure_pw_working_title') }}</h6>
                 <p>
                     {{  __('firefly.secure_pw_working')|raw  }}
                 </p>
-                <h4>{{ __('firefly.secure_pw_should') }}</h4>
+                <h6>{{ __('firefly.secure_pw_should') }}</h6>
                 <p>
                     {{ __('firefly.secure_pw_long_password') }}
                 </p>
diff --git a/resources/views/partials/password-modal.blade.php b/resources/views/partials/password-modal.blade.php
index 367ec523547..c184e2e744e 100644
--- a/resources/views/partials/password-modal.blade.php
+++ b/resources/views/partials/password-modal.blade.php
@@ -1,13 +1,13 @@
-<div class="modal fade" id="passwordModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+<div class="modal fade" id="passwordModal" tabindex="-1" role="dialog" aria-labelledby="passwordModalTitle" aria-describedby="passwordModalBody" aria-hidden="true">
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-header">
-                <h5 class="modal-title">
+                <h5 class="modal-title" id="passwordModalTitle">
                     {{ __('firefly.secure_pw_title') }}
                 </h5>
                 <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="{{ __('firefly.close') }}"></button>
             </div>
-            <div class="modal-body">
+            <div class="modal-body" id="passwordModalBody">
                 <p>
                     {{ __('firefly.secure_pw_history') }}
                 </p>
@@ -18,11 +18,11 @@
                     {{ __('firefly.secure_pw_check_box') }}
                 </p>
 
-                <h4>{{ __('firefly.secure_pw_working_title') }}</h4>
+                <h6>{{ __('firefly.secure_pw_working_title') }}</h6>
                 <p>
                     {!!  __('firefly.secure_pw_working')  !!}
                 </p>
-                <h4>{{ __('firefly.secure_pw_should') }}</h4>
+                <h6>{{ __('firefly.secure_pw_should') }}</h6>
                 <p>
                     {{ __('firefly.secure_pw_long_password') }}
                 </p>
diff --git a/resources/views/piggy-banks/add-mobile.twig b/resources/views/piggy-banks/add-mobile.twig
index 79aeec0cd25..c0146d61923 100644
--- a/resources/views/piggy-banks/add-mobile.twig
+++ b/resources/views/piggy-banks/add-mobile.twig
@@ -11,7 +11,7 @@
             <div class="col-lg-12 col-md-12 col-sm-12">
                 <div class="box box-primary">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ trans('firefly.add_money_to_piggy', {name: piggyBank.name}) }}</h3>
+                        <h1 class="box-title">{{ trans('firefly.add_money_to_piggy', {name: piggyBank.name}) }}</h1>
                     </div>
                     <div class="box-body">
                         {% if total > 0 %}
diff --git a/resources/views/piggy-banks/create.twig b/resources/views/piggy-banks/create.twig
index 851efe5f2b4..e8cd1166d98 100644
--- a/resources/views/piggy-banks/create.twig
+++ b/resources/views/piggy-banks/create.twig
@@ -5,6 +5,7 @@
 {% endblock %}
 
 {% block content %}
+    <h1>{{ 'create_piggy_bank'|_ }}</h1>
 
     <form method="POST" action="{{ route('piggy-banks.store') }}" accept-charset="UTF-8" class="form-horizontal" id="store" enctype="multipart/form-data">
         <input name="_token" type="hidden" value="{{ csrf_token() }}">
@@ -12,7 +13,7 @@
             <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
                 <div class="box box-primary">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
+                        <h2 class="box-title">{{ 'mandatoryFields'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         {{ ExpandedForm.text('name') }}
@@ -26,7 +27,7 @@
             <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'optionalFields'|_ }}</h3>
+                        <h2 class="box-title">{{ 'optionalFields'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         {{ ExpandedForm.date('target_date') }}
@@ -42,7 +43,7 @@
                 {# panel for options #}
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'options'|_ }}</h3>
+                        <h2 class="box-title">{{ 'options'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         {{ ExpandedForm.optionsList('create','piggy bank') }}
diff --git a/resources/views/piggy-banks/delete.twig b/resources/views/piggy-banks/delete.twig
index eae14383d11..44404531732 100644
--- a/resources/views/piggy-banks/delete.twig
+++ b/resources/views/piggy-banks/delete.twig
@@ -12,7 +12,7 @@
             <div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12">
                 <div class="box box-danger">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ trans('firefly.delete_piggy_bank', {'name': piggyBank.name}) }}</h3>
+                        <h1 class="box-title">{{ trans('firefly.delete_piggy_bank', {'name': piggyBank.name}) }}</h1>
                     </div>
                     <div class="box-body">
                         <p class="text-danger">
diff --git a/resources/views/piggy-banks/edit.twig b/resources/views/piggy-banks/edit.twig
index 8489ca80649..244a6cd09c5 100644
--- a/resources/views/piggy-banks/edit.twig
+++ b/resources/views/piggy-banks/edit.twig
@@ -17,7 +17,7 @@
             <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
                 <div class="box box-primary">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
+                        <h2 class="box-title">{{ 'mandatoryFields'|_ }}</h2>
                     </div>
 
                     <div class="box-body">
@@ -33,7 +33,7 @@
             <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'optionalFields'|_ }}</h3>
+                        <h2 class="box-title">{{ 'optionalFields'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         {{ ExpandedForm.date('start_date') }}
@@ -50,7 +50,7 @@
                 {# panel for options #}
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'options'|_ }}</h3>
+                        <h2 class="box-title">{{ 'options'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         {{ ExpandedForm.optionsList('update','piggy bank') }}
diff --git a/resources/views/piggy-banks/index.twig b/resources/views/piggy-banks/index.twig
index 7a25c002d48..3560ebd8cda 100644
--- a/resources/views/piggy-banks/index.twig
+++ b/resources/views/piggy-banks/index.twig
@@ -12,7 +12,7 @@
             <div class="col-lg-12 col-md-12 col-sm-12">
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'piggyBanks'|_ }}</h3>
+                        <h1 class="box-title">{{ 'piggyBanks'|_ }}</h1>
                     </div>
                     <div class="box-body no-padding">
                         <div style="padding:8px;">
@@ -31,18 +31,18 @@
             <div class="col-lg-12 col-md-12 col-sm-12">
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'account_status'|_ }}</h3>
+                        <h2 class="box-title">{{ 'account_status'|_ }}</h2>
                     </div>
                     <div class="box-body no-padding">
-                        <table class="table table-responsive table-hover" id="accountStatus">
+                        <table class="table table-responsive table-hover" id="accountStatus" aria-label="{{ 'account_status'|_ }}">
                             <thead>
                             <tr>
-                                <th>{{ 'account'|_ }}</th>
-                                <th style="text-align:right;" class="hidden-sm hidden-xs">{{ 'balance'|_ }}</th>
-                                <th style="text-align:right;">{{ 'left_for_piggy_banks'|_ }}</th>
-                                <th style="text-align:right;" class="hidden-sm hidden-xs">{{ 'sum_of_piggy_banks'|_ }}</th>
-                                <th style="text-align:right;" class="hidden-sm hidden-xs">{{ 'saved_so_far'|_ }}</th>
-                                <th style="text-align:right;" class="hidden-sm hidden-xs">{{ 'left_to_save'|_ }}</th>
+                                <th scope="col">{{ 'account'|_ }}</th>
+                                <th scope="col" style="text-align:right;" class="hidden-sm hidden-xs">{{ 'balance'|_ }}</th>
+                                <th scope="col" style="text-align:right;">{{ 'left_for_piggy_banks'|_ }}</th>
+                                <th scope="col" style="text-align:right;" class="hidden-sm hidden-xs">{{ 'sum_of_piggy_banks'|_ }}</th>
+                                <th scope="col" style="text-align:right;" class="hidden-sm hidden-xs">{{ 'saved_so_far'|_ }}</th>
+                                <th scope="col" style="text-align:right;" class="hidden-sm hidden-xs">{{ 'left_to_save'|_ }}</th>
                             </tr>
                             </thead>
                             <tbody>
diff --git a/resources/views/piggy-banks/remove-mobile.twig b/resources/views/piggy-banks/remove-mobile.twig
index 192f5e7d537..9a2c9c89871 100644
--- a/resources/views/piggy-banks/remove-mobile.twig
+++ b/resources/views/piggy-banks/remove-mobile.twig
@@ -10,7 +10,7 @@
             <div class="col-lg-12 col-md-12 col-sm-12">
                 <div class="box box-primary">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ trans('firefly.remove_money_from_piggy_title', {name: piggyBank.name}) }}</h3>
+                        <h1 class="box-title">{{ trans('firefly.remove_money_from_piggy_title', {name: piggyBank.name}) }}</h1>
                     </div>
                     <div class="box-body">
 
diff --git a/resources/views/piggy-banks/remove.twig b/resources/views/piggy-banks/remove.twig
index e4b381aa8d9..428b9a935c0 100644
--- a/resources/views/piggy-banks/remove.twig
+++ b/resources/views/piggy-banks/remove.twig
@@ -6,7 +6,7 @@
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal"><span>&times;</span><span class="sr-only">{{ 'close'|_ }}</span>
                 </button>
-                <h4 class="modal-title">{{ trans('firefly.remove_money_from_piggy_title', {name: piggyBank.name}) }}</h4>
+                <h1 class="modal-title">{{ trans('firefly.remove_money_from_piggy_title', {name: piggyBank.name}) }}</h1>
             </div>
 
             <div class="modal-body">
diff --git a/resources/views/piggy-banks/show.twig b/resources/views/piggy-banks/show.twig
index 6a5e58f3da3..efd655ae32a 100644
--- a/resources/views/piggy-banks/show.twig
+++ b/resources/views/piggy-banks/show.twig
@@ -5,11 +5,12 @@
 {% endblock %}
 
 {% block content %}
+    <h1 class="sr-only">{{ piggyBank.name }} - {{ 'piggy_bank_details'|_ }}</h1>
     <div class="row">
         <div class="col-lg-8 col-md-8 col-sm-6">
             <div class="box" id="piggyChart">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'events'|_ }}</h3>
+                    <h2 class="box-title">{{ 'events'|_ }}</h2>
                 </div>
                 <div class="box-body">
                     <canvas id="piggy-bank-history" style="width:100%;height:400px;" height="400" width="100%"></canvas>
@@ -19,7 +20,7 @@
         <div class="col-lg-4 col-md-4 col-sm-6">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'details'|_ }}</h3>
+                    <h2 class="box-title">{{ 'details'|_ }}</h2>
                     <div class="box-tools pull-right">
                         <div class="btn-group">
                             <button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><span class="fa fa-ellipsis-v"></span></button>
@@ -31,7 +32,7 @@
                     </div>
                 </div>
                 <div class="box-body no-padding">
-                    <table class="table table-responsive table-hover" id="piggyDetails">
+                    <table class="table table-responsive table-hover" id="piggyDetails" aria-label="{{ 'piggy_bank_details'|_ }}">
                         <tr>
                             <td style="width:40%;">{{ 'saveOnAccounts'|_ }}</td>
                             <td>
@@ -114,7 +115,7 @@
             </div>
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'event_history'|_ }} (<a onclick="return confirm('{{ 'reset_history_confirm'|_|escape('js') }}');" class="reset-link" href="#">{{ 'reset_history'|_ }}</a>)</h3>
+                    <h2 class="box-title">{{ 'event_history'|_ }} (<a onclick="return confirm('{{ 'reset_history_confirm'|_|escape('js') }}');" class="reset-link" href="#">{{ 'reset_history'|_ }}</a>)</h2>
                 </div>
                 <div class="box-body no-padding" id="piggyEvents">
                     {% include 'list/piggy-bank-events' %}
@@ -129,7 +130,7 @@
 
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ trans('form.notes') }}</h3>
+                        <h2 class="box-title">{{ trans('form.notes') }}</h2>
                     </div>
                     <div class="box-body markdown">{{ piggy.notes|default('')|markdown }}
                     </div>
@@ -141,9 +142,9 @@
             <div class="col-lg-4 col-md-6 col-sm-12 col-xs-12">
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">
+                        <h2 class="box-title">
                             {{ 'attachments'|_ }}
-                        </h3>
+                        </h2>
                     </div>
                     <div class="box-body no-padding">
                         {% include 'list.attachments' %}
diff --git a/resources/views/popup/list/journals.twig b/resources/views/popup/list/journals.twig
index 6a29d08f847..34034c675cc 100644
--- a/resources/views/popup/list/journals.twig
+++ b/resources/views/popup/list/journals.twig
@@ -1,28 +1,30 @@
-<table class="table table-hover table-condensed">
+<table class="table table-hover table-condensed" aria-label="{{ 'transaction_list'|_ }}">
     <thead>
     <tr>
-        <th>&nbsp;</th>
-        <th>{{ trans('list.description') }}</th>
-        <th>{{ trans('list.amount') }}</th>
-        <th class="hidden-sm hidden-xs">{{ trans('list.date') }}</th>
+        <th scope="col">{{ 'transaction_type'|_ }}</th>
+        <th scope="col">{{ trans('list.description') }}</th>
+        <th scope="col">{{ trans('list.amount') }}</th>
+        <th scope="col" class="hidden-sm hidden-xs">{{ trans('list.date') }}</th>
         {% if not hideSource %}
-            <th class="hidden-xs">{{ trans('list.from') }}</th>
+            <th scope="col" class="hidden-xs">{{ trans('list.from') }}</th>
         {% endif %}
         {% if not hideDestination %}
-            <th class="hidden-xs">{{ trans('list.to') }}</th>
+            <th scope="col" class="hidden-xs">{{ trans('list.to') }}</th>
         {% endif %}
 
         {# Hide budgets? #}
         {% if not hideBudget %}
-            <th class="hidden-xs">
-                <span class="fa fa-pie-chart fa-fw" title="{{ trans('list.budget') }}"></span>
+            <th scope="col" class="hidden-xs">
+                <span class="fa fa-pie-chart fa-fw" aria-hidden="true"></span>
+                <span class="sr-only">{{ trans('list.budget') }}</span>
             </th>
         {% endif %}
 
         {# Hide categories? #}
         {% if not hideCategory %}
-            <th class="hidden-xs">
-                <span class="fa fa-bookmark fa-fw" title="{{ trans('list.category') }}"></span>
+            <th scope="col" class="hidden-xs">
+                <span class="fa fa-bookmark fa-fw" aria-hidden="true"></span>
+                <span class="sr-only">{{ trans('list.category') }}</span>
             </th>
         {% endif %}
     </tr>
diff --git a/resources/views/popup/report/income-entry.twig b/resources/views/popup/report/income-entry.twig
index c49306440c4..f3352fb7577 100644
--- a/resources/views/popup/report/income-entry.twig
+++ b/resources/views/popup/report/income-entry.twig
@@ -2,8 +2,8 @@
     <div class="modal-content">
         <div class="modal-header">
             <button type="button" class="close" data-dismiss="modal" aria-label="{{ 'close'|_ }}"><span>&times;</span></button>
-            <h4 class="modal-title"
-                id="incomeEntryTitle">{{ trans('firefly.income_entry', {name: account.name, start: start.isoFormat(monthAndDayFormat), end: end.isoFormat(monthAndDayFormat)}) }}</h4>
+            <h2 class="modal-title"
+                id="incomeEntryTitle">{{ trans('firefly.income_entry', {name: account.name, start: start.isoFormat(monthAndDayFormat), end: end.isoFormat(monthAndDayFormat)}) }}</h2>
         </div>
         <div class="modal-body">
             {% set hideBudget = true %}
diff --git a/resources/views/profile/change-email.twig b/resources/views/profile/change-email.twig
index 6f1e9a80b28..8e8bd4f7c45 100644
--- a/resources/views/profile/change-email.twig
+++ b/resources/views/profile/change-email.twig
@@ -12,7 +12,7 @@
             <div class="col-lg-6 col-md-12 col-sm-12">
                 <div class="box box-primary">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'change_your_email'|_ }}</h3>
+                        <h1 class="box-title">{{ 'change_your_email'|_ }}</h1>
                     </div>
                     <div class="box-body">
 
diff --git a/resources/views/profile/change-password.twig b/resources/views/profile/change-password.twig
index 80bf41056d8..f711e7ec902 100644
--- a/resources/views/profile/change-password.twig
+++ b/resources/views/profile/change-password.twig
@@ -12,7 +12,7 @@
             <div class="col-lg-6 col-md-12 col-sm-12">
                 <div class="box box-primary">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'change_your_password'|_ }}</h3>
+                        <h1 class="box-title">{{ 'change_your_password'|_ }}</h1>
                     </div>
                     <div class="box-body">
 
diff --git a/resources/views/profile/delete-account.twig b/resources/views/profile/delete-account.twig
index 839380e0395..96347bd3fdd 100644
--- a/resources/views/profile/delete-account.twig
+++ b/resources/views/profile/delete-account.twig
@@ -5,6 +5,7 @@
 {% endblock %}
 
 {% block content %}
+    <h1 class="sr-only">{{ 'delete_your_account'|_ }}</h1>
     <form method="POST" action="{{ route('profile.delete-account.post') }}" accept-charset="UTF-8" class="form-horizontal" id="delete-account">
         <input name="_token" type="hidden" value="{{ csrf_token() }}">
 
@@ -12,7 +13,7 @@
             <div class="col-lg-6 col-md-12 col-sm-12">
                 <div class="box box-danger">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'delete_your_account'|_ }}</h3>
+                        <h2 class="box-title">{{ 'delete_your_account'|_ }}</h2>
                     </div>
                     <div class="box-body">
 
diff --git a/resources/views/profile/index.twig b/resources/views/profile/index.twig
index 087445222c9..3eb0763911f 100644
--- a/resources/views/profile/index.twig
+++ b/resources/views/profile/index.twig
@@ -160,7 +160,7 @@
                 <div role="tabpanel" class="tab-pane" id="delete">
                     <div class="box box-default">
                         <div class="box-header with-border">
-                            <h3 class="box-title">{{ 'purge_data_title'|_ }}</h3>
+                            <h2 class="box-title">{{ 'purge_data_title'|_ }}</h2>
                         </div>
                         <div class="box-body with-border">
                             <div class="col-lg-12">
@@ -181,14 +181,14 @@
                     <!-- delete stuff -->
                     <div class="box box-default">
                         <div class="box-header with-border">
-                            <h3 class="box-title">{{ 'delete_data_title'|_ }}</h3>
+                            <h2 class="box-title">{{ 'delete_data_title'|_ }}</h2>
                         </div>
                         <div class="box-body with-border">
                             <div class="col-lg-12">
                                 <p class="text-info">
                                     {{ 'permanent_delete_stuff'|_ }}
                                 </p>
-                                <h4>{{ 'financial_control'|_ }}</h4>
+                                <h3>{{ 'financial_control'|_ }}</h3>
                                 <div class="btn-group">
                                     <button type="button"
                                             data-success="{{ trans('firefly.deleted_all_budgets')|escape('html') }}"
@@ -205,7 +205,7 @@
                                             data-type="piggy_banks" class="confirm btn btn-danger btn-sm"><span
                                                 class="fa fa-bullseye"></span> {{ 'delete_all_piggy_banks'|_ }}</button>
                                 </div>
-                                <h4>{{ 'automation'|_ }}</h4>
+                                <h3>{{ 'automation'|_ }}</h3>
                                 <div class="btn-group">
                                     <button type="button"
                                             data-success="{{ trans('firefly.deleted_all_rules')|escape('html') }}"
@@ -219,7 +219,7 @@
                                     </button>
                                 </div>
 
-                                <h4>{{ 'classification'|_ }}</h4>
+                                <h3>{{ 'classification'|_ }}</h3>
                                 <div class="btn-group">
                                     <button type="button"
                                             data-success="{{ trans('firefly.deleted_all_categories')|escape('html') }}"
@@ -238,7 +238,7 @@
                                     </button>
                                 </div>
 
-                                <h4>{{ 'accounts'|_ }}</h4>
+                                <h3>{{ 'accounts'|_ }}</h3>
                                 <p>
                                     <em class="text-danger">{{ 'also_delete_transactions'|_ }}</em>
                                 </p>
@@ -269,7 +269,7 @@
                                             data-type="liabilities" class="confirm btn btn-danger btn-sm"><span
                                                 class="fa fa-ticket"></span> {{ 'delete_all_liabilities'|_ }}</button>
                                 </div>
-                                <h4>{{ 'accounts'|_ }}</h4>
+                                <h3>{{ 'accounts'|_ }}</h3>
                                 <p>
                                     <em class="text-info">
                                         {{ 'delete_unused_accounts'|_ }}
@@ -284,7 +284,7 @@
                                 </div>
 
 
-                                <h4> {{ 'transactions'|_ }}</h4>
+                                <h3>{{ 'transactions'|_ }}</h3>
                                 <div class="btn-group">
                                     <button type="button"
                                             data-success="{{ trans('firefly.deleted_all_transactions')|escape('html') }}"
diff --git a/resources/views/profile/logout-other-sessions.twig b/resources/views/profile/logout-other-sessions.twig
index 4399b044c0e..59b9718814b 100644
--- a/resources/views/profile/logout-other-sessions.twig
+++ b/resources/views/profile/logout-other-sessions.twig
@@ -5,6 +5,7 @@
 {% endblock %}
 
 {% block content %}
+    <h1>{{ 'logout_other_sessions'|_ }}</h1>
     <form method="POST" action="{{ route('profile.logout-others.post') }}" accept-charset="UTF-8" class="form-horizontal">
         <input name="_token" type="hidden" value="{{ csrf_token() }}">
 
@@ -12,7 +13,7 @@
             <div class="col-lg-6 col-md-12 col-sm-12">
                 <div class="box box-primary">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'logout_other_sessions'|_ }}</h3>
+                        <h2 class="box-title">{{ 'logout_other_sessions'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         <div class="form-group">
diff --git a/resources/views/profile/mfa/backup-codes-intro.twig b/resources/views/profile/mfa/backup-codes-intro.twig
index b67e2c11e8d..e7ac86314bc 100644
--- a/resources/views/profile/mfa/backup-codes-intro.twig
+++ b/resources/views/profile/mfa/backup-codes-intro.twig
@@ -11,7 +11,7 @@
             <div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12 col-xs-12">
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'mfa_backup_codes_title'|_ }}</h3>
+                        <h1 class="box-title">{{ 'mfa_backup_codes_title'|_ }}</h1>
                     </div>
                     <div class="box-body">
                         <div class="form group">
diff --git a/resources/views/profile/mfa/backup-codes-post.twig b/resources/views/profile/mfa/backup-codes-post.twig
index 535edebb0b9..8689bdc7207 100644
--- a/resources/views/profile/mfa/backup-codes-post.twig
+++ b/resources/views/profile/mfa/backup-codes-post.twig
@@ -9,7 +9,7 @@
             <div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12 col-xs-12">
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'mfa_backup_codes_post_title'|_ }}</h3>
+                        <h1 class="box-title">{{ 'mfa_backup_codes_post_title'|_ }}</h1>
                     </div>
                     <div class="box-body">
                         <div class="form group">
diff --git a/resources/views/profile/mfa/disable-mfa.twig b/resources/views/profile/mfa/disable-mfa.twig
index 662c63ed0d5..2f559a63164 100644
--- a/resources/views/profile/mfa/disable-mfa.twig
+++ b/resources/views/profile/mfa/disable-mfa.twig
@@ -11,7 +11,7 @@
             <div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12 col-xs-12">
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'disable_mfa_page'|_ }}</h3>
+                        <h1 class="box-title">{{ 'disable_mfa_page'|_ }}</h1>
                     </div>
                     <div class="box-body">
                         <p class="hidden-print">
diff --git a/resources/views/profile/mfa/enable-mfa.twig b/resources/views/profile/mfa/enable-mfa.twig
index a9016479177..94e8555bd97 100644
--- a/resources/views/profile/mfa/enable-mfa.twig
+++ b/resources/views/profile/mfa/enable-mfa.twig
@@ -11,7 +11,7 @@
             <div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12 col-xs-12">
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'pref_two_factor_auth_code'|_ }}</h3>
+                        <h1 class="box-title">{{ 'pref_two_factor_auth_code'|_ }}</h1>
                     </div>
                     <div class="box-body">
                         <p class="hidden-print">
diff --git a/resources/views/profile/mfa/index.twig b/resources/views/profile/mfa/index.twig
index 33ad9aa3b9e..b84281e9fa3 100644
--- a/resources/views/profile/mfa/index.twig
+++ b/resources/views/profile/mfa/index.twig
@@ -10,9 +10,9 @@
         <div class="col-lg-8 col-lg-offset-2 col-md-12 col-sm-12">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">
+                    <h1 class="box-title">
                         {{ 'mfa_index_title'|_ }}
-                    </h3>
+                    </h1>
                 </div>
                 <div class="box-body">
                     <p>
diff --git a/resources/views/profile/new-backup-codes.twig b/resources/views/profile/new-backup-codes.twig
index 77128da1846..51a6012cdf1 100644
--- a/resources/views/profile/new-backup-codes.twig
+++ b/resources/views/profile/new-backup-codes.twig
@@ -9,7 +9,7 @@
             <div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12 col-xs-12">
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'pref_two_factor_auth_code'|_ }}</h3>
+                        <h1 class="box-title">{{ 'pref_two_factor_auth_code'|_ }}</h1>
                     </div>
                     <div class="box-body">
                         <div class="form group">
diff --git a/resources/views/recurring/create.twig b/resources/views/recurring/create.twig
index 2ae827973d5..c066157422d 100644
--- a/resources/views/recurring/create.twig
+++ b/resources/views/recurring/create.twig
@@ -3,6 +3,7 @@
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
 {% endblock %}
 {% block content %}
+    <h1 class="sr-only">{{ 'create_new_recurrence'|_ }}</h1>
 
     <form action="{{ route('recurring.store') }}" method="post" id="store" class="form-horizontal"
           enctype="multipart/form-data">
@@ -14,7 +15,7 @@
                 {# mandatory recurrence stuff #}
                 <div class="box box-primary">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'mandatory_for_recurring'|_ }}</h3>
+                        <h2 class="box-title">{{ 'mandatory_for_recurring'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         {{ ExpandedForm.text('title') }}
@@ -46,7 +47,7 @@
                 {# optional recurrence stuff #}
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'optional_for_recurring'|_ }}</h3>
+                        <h2 class="box-title">{{ 'optional_for_recurring'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         {{ ExpandedForm.textarea('recurring_description') }}
@@ -65,7 +66,7 @@
                 {# mandatory transaction information #}
                 <div class="box box-primary">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'mandatory_for_transaction'|_ }}</h3>
+                        <h2 class="box-title">{{ 'mandatory_for_transaction'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         <p><em>{{ 'mandatory_fields_for_tranaction'|_ }}</em></p>
@@ -116,7 +117,7 @@
                 {# optional transaction information #}
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'optional_for_transaction'|_ }}</h3>
+                        <h2 class="box-title">{{ 'optional_for_transaction'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         {# transaction information (optional) #}
@@ -155,7 +156,7 @@
             <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'options'|_ }}</h3>
+                        <h2 class="box-title">{{ 'options'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         {{ ExpandedForm.optionsList('create','recurrence') }}
@@ -172,7 +173,7 @@
         <div class="row">
             <div class="box box-primary">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'expected_repetitions'|_ }}</h3>
+                    <h2 class="box-title">{{ 'expected_repetitions'|_ }}</h2>
                 </div>
                 <div class="box-body">
                     Here.
@@ -185,11 +186,11 @@
     </form>
 
     {# calendar modal #}
-    <div class="modal fade" id="calendarModal" tabindex="-1" role="dialog">
+    <div class="modal fade" id="calendarModal" tabindex="-1" role="dialog" aria-labelledby="calendarModalTitle" aria-hidden="true">
         <div class="modal-dialog modal-lg">
             <div class="modal-content">
                 <div class="modal-header">
-                    <h4 class="modal-title">{{ 'recurring_calendar_view'|_ }}</h4>
+                    <h3 class="modal-title" id="calendarModalTitle">{{ 'recurring_calendar_view'|_ }}</h3>
                 </div>
                 <div class="modal-body">
                     <div id="recurring_calendar" style="max-width: 400px;margin: 0 auto;">
diff --git a/resources/views/recurring/delete.twig b/resources/views/recurring/delete.twig
index c0599345b71..29965e9a3e4 100644
--- a/resources/views/recurring/delete.twig
+++ b/resources/views/recurring/delete.twig
@@ -12,7 +12,7 @@
             <div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12">
                 <div class="box box-danger">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ trans('form.delete_recurring', {'title': recurrence.title}) }}</h3>
+                        <h1 class="box-title">{{ trans('form.delete_recurring', {'title': recurrence.title}) }}</h1>
                     </div>
                     <div class="box-body">
                         <p class="text-danger">
diff --git a/resources/views/recurring/edit.twig b/resources/views/recurring/edit.twig
index 725337de761..0e3b4fe2850 100644
--- a/resources/views/recurring/edit.twig
+++ b/resources/views/recurring/edit.twig
@@ -3,6 +3,7 @@
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, recurrence) }}
 {% endblock %}
 {% block content %}
+    <h1 class="sr-only">{{ 'edit_recurrence'|_ }}: {{ recurrence.title }}</h1>
 
     <form method="post" action="{{ route('recurring.update', recurrence.id) }}" class="form-horizontal"
           accept-charset="UTF-8"
@@ -16,7 +17,7 @@
                 {# mandatory recurrence stuff #}
                 <div class="box box-primary">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'mandatory_for_recurring'|_ }}</h3>
+                        <h2 class="box-title">{{ 'mandatory_for_recurring'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         <input type="hidden" name="id" value="{{ array.id }}"/>
@@ -48,7 +49,7 @@
                 {# optional recurrence stuff #}
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'optional_for_recurring'|_ }}</h3>
+                        <h2 class="box-title">{{ 'optional_for_recurring'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         {{ ExpandedForm.textarea('recurring_description',array.description) }}
@@ -67,7 +68,7 @@
                 {# mandatory transaction information #}
                 <div class="box box-primary">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'mandatory_for_transaction'|_ }}</h3>
+                        <h2 class="box-title">{{ 'mandatory_for_transaction'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         <p><em>{{ 'mandatory_fields_for_tranaction'|_ }}</em></p>
@@ -114,7 +115,7 @@
                 {# optional transaction information #}
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'optional_for_transaction'|_ }}</h3>
+                        <h2 class="box-title">{{ 'optional_for_transaction'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         {# transaction information (optional) #}
@@ -154,7 +155,7 @@
             <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'options'|_ }}</h3>
+                        <h2 class="box-title">{{ 'options'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         {{ ExpandedForm.optionsList('update','recurrence') }}
@@ -171,7 +172,7 @@
         <div class="row">
             <div class="box box-primary">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'expected_repetitions'|_ }}</h3>
+                    <h2 class="box-title">{{ 'expected_repetitions'|_ }}</h2>
                 </div>
                 <div class="box-body">
                     Here.
@@ -184,11 +185,11 @@
     </form>
 
     {# calendar modal #}
-    <div class="modal fade" id="calendarModal" tabindex="-1" role="dialog">
+    <div class="modal fade" id="calendarModal" tabindex="-1" role="dialog" aria-labelledby="calendarModalLabel" aria-hidden="true">
         <div class="modal-dialog modal-lg">
             <div class="modal-content">
                 <div class="modal-header">
-                    <h4 class="modal-title">{{ 'recurring_calendar_view'|_ }}</h4>
+                    <h3 class="modal-title" id="calendarModalLabel">{{ 'recurring_calendar_view'|_ }}</h3>
                 </div>
                 <div class="modal-body">
                     <div id="recurring_calendar" style="max-width: 400px;margin: 0 auto;">
diff --git a/resources/views/recurring/index.twig b/resources/views/recurring/index.twig
index a484df4d034..a7190fa1b63 100644
--- a/resources/views/recurring/index.twig
+++ b/resources/views/recurring/index.twig
@@ -11,9 +11,9 @@
             <div class="col-lg-12 col-md-12 col-sm-12">
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">
+                        <h1 class="box-title">
                             {{ 'recurrences'|_ }}
-                        </h3>
+                        </h1>
                         <div class="box-tools pull-right">
                             <div class="btn-group">
                                 <button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><span class="fa fa-ellipsis-v"></span></button>
@@ -34,14 +34,14 @@
                         <div style="padding-left:8px;">
                             {{ paginator.links('pagination.bootstrap-4')|raw }}
                         </div>
-                        <table class="table table-responsive  table-hover sortable">
+                        <table class="table table-responsive  table-hover sortable" aria-label="{{ 'recurrences'|_ }}">
                             <thead>
                             <tr>
-                                <th class="hidden-sm hidden-xs" data-defaultsort="disabled">&nbsp;</th>
-                                <th data-defaultsign="az">{{ trans('list.title') }}</th>
-                                <th data-defaultsort="disabled">{{ trans('list.transaction_s') }}</th>
-                                <th data-defaultsort="disabled">{{ trans('list.repetitions') }}</th>
-                                <th data-defaultsign="month" data-dateformat="{{ madMomentJS }}">{{ trans('list.next_due') }}</th>
+                                <th class="hidden-sm hidden-xs" data-defaultsort="disabled" scope="col">&nbsp;</th>
+                                <th data-defaultsign="az" scope="col">{{ trans('list.title') }}</th>
+                                <th data-defaultsort="disabled" scope="col">{{ trans('list.transaction_s') }}</th>
+                                <th data-defaultsort="disabled" scope="col">{{ trans('list.repetitions') }}</th>
+                                <th data-defaultsign="month" data-dateformat="{{ madMomentJS }}" scope="col">{{ trans('list.next_due') }}</th>
                             </tr>
                             </thead>
                             <tbody>
diff --git a/resources/views/recurring/show.twig b/resources/views/recurring/show.twig
index b9e2f0893c7..6e2fe2033c2 100644
--- a/resources/views/recurring/show.twig
+++ b/resources/views/recurring/show.twig
@@ -10,7 +10,7 @@
     <div class="col-lg-8 col-md-12 col-sm-12">
         <div class="box">
             <div class="box-header with-border">
-                <h3 class="box-title">
+                <h1 class="box-title">
                     {{ array.title }}
 
                     ({{ array.type }})
@@ -18,10 +18,10 @@
                     {% if array.active == false %}
                         ({{ 'inactive'|_|lower }})
                     {% endif %}
-                </h3>
+                </h1>
             </div>
             <div class="box-body">
-                <h4>{{ 'transaction_journal_meta'|_ }}</h4>
+                <h2>{{ 'transaction_journal_meta'|_ }}</h2>
                 {% if array.nr_of_repetitions > 0 %}
                 <p>
                     {% if array.journal_count >= array.nr_of_repetitions %}
@@ -46,7 +46,7 @@
                         <li>{{ rep.description }}</li>
                     {% endfor %}
                 </ul>
-                <h4>{{ 'attachments'|_ }}</h4>
+                <h2>{{ 'attachments'|_ }}</h2>
                 {% include 'list.attachments' with {attachments: array.attachments} %}
             </div>
             <div class="box-footer">
@@ -63,9 +63,9 @@
     <div class="col-lg-4 col-md-12 col-sm-12">
         <div class="box">
             <div class="box-header with-border">
-                <h3 class="box-title">
+                <h2 class="box-title">
                     {{ ('expected_'~array.type~'s')|_ }}
-                </h3>
+                </h2>
             </div>
             <div class="box-body">
                 {% if null != array.repeat_until and today > array.repeat_until %}
@@ -84,7 +84,7 @@
                             {% endif %}
                         </strong>
                     </p>
-                    <table class="table" aria-label="Table">
+                    <table class="table" aria-label="{{ 'expected_occurrences'|_ }}">
                         <tbody>
                         {% for occ in rep.occurrences %}
                             <tr>
@@ -120,21 +120,21 @@
     <div class="col-lg-12 col-md-12 col-sm-12">
         <div class="box">
             <div class="box-header with-border">
-                <h3 class="box-title">
+                <h2 class="box-title">
                     {{ 'transaction_data'|_ }}
-                </h3>
+                </h2>
             </div>
             <div class="box-body no-padding">
-                <table class="table table-hover sortable">
+                <table class="table table-hover sortable" aria-label="{{ 'transaction_data'|_ }}">
                     <thead>
                     <tr>
-                        <th data-defaultsign="az">{{ trans('list.description') }}</th>
-                        <th data-defaultsign="az">{{ trans('list.source') }}</th>
-                        <th data-defaultsign="az">{{ trans('list.destination') }}</th>
-                        <th data-defaultsign="_19">{{ trans('list.amount') }}</th>
-                        <th data-defaultsign="az">{{ trans('list.category') }}</th>
-                        <th data-defaultsign="az">{{ trans('list.budget') }}</th>
-                        <th>{{ trans('list.other_meta_data') }}</th>
+                        <th scope="col" data-defaultsign="az">{{ trans('list.description') }}</th>
+                        <th scope="col" data-defaultsign="az">{{ trans('list.source') }}</th>
+                        <th scope="col" data-defaultsign="az">{{ trans('list.destination') }}</th>
+                        <th scope="col" data-defaultsign="_19">{{ trans('list.amount') }}</th>
+                        <th scope="col" data-defaultsign="az">{{ trans('list.category') }}</th>
+                        <th scope="col" data-defaultsign="az">{{ trans('list.budget') }}</th>
+                        <th scope="col">{{ trans('list.other_meta_data') }}</th>
                     </tr>
                     </thead>
                     <tbody>
@@ -200,9 +200,9 @@
         <div class="col-lg-12 col-md-12 col-sm-12">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">
+                    <h2 class="box-title">
                         {{ ('created_'~array.type~'s')|_ }}
-                    </h3>
+                    </h2>
                 </div>
                 <div class="box-body">
                     {% include 'list.groups' %}
diff --git a/resources/views/reports/budget/month.twig b/resources/views/reports/budget/month.twig
index faf3a113b58..2f16ef99d19 100644
--- a/resources/views/reports/budget/month.twig
+++ b/resources/views/reports/budget/month.twig
@@ -10,7 +10,7 @@
         <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'accounts'|_ }}</h3>
+                    <h2 class="box-title">{{ 'accounts'|_ }}</h2>
                 </div>
                 <div class="box-body table-responsive no-padding" id="accountsHolder">
                 </div>
@@ -23,7 +23,7 @@
         <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'budgets'|_ }}</h3>
+                    <h2 class="box-title">{{ 'budgets'|_ }}</h2>
                 </div>
                 <div class="box-body table-responsive no-padding" id="budgetsHolder">
                 </div>
@@ -38,7 +38,7 @@
         <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'account_per_budget'|_ }}</h3>
+                    <h2 class="box-title">{{ 'account_per_budget'|_ }}</h2>
                 </div>
                 <div class="box-body table-responsive no-padding" id="accountPerbudgetHolder">
                 </div>
@@ -53,7 +53,7 @@
         <div class="col-lg-6 col-md-6">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'expense_per_budget'|_ }}</h3>
+                    <h2 class="box-title">{{ 'expense_per_budget'|_ }}</h2>
                 </div>
                 <div class="box-body">
                     <div style="width:100%;margin:0 auto;">
@@ -65,7 +65,7 @@
         <div class="col-lg-6 col-md-6">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'expense_per_category'|_ }}</h3>
+                    <h2 class="box-title">{{ 'expense_per_category'|_ }}</h2>
                 </div>
                 <div class="box-body">
                     <div style="width:100%;margin:0 auto;">
@@ -79,7 +79,7 @@
         <div class="col-lg-6 col-md-6">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'expense_per_source_account'|_ }}</h3>
+                    <h2 class="box-title">{{ 'expense_per_source_account'|_ }}</h2>
                 </div>
                 <div class="box-body">
                     <div style="width:100%;margin:0 auto;">
@@ -91,7 +91,7 @@
         <div class="col-lg-6 col-md-6">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'expense_per_destination_account'|_ }}</h3>
+                    <h2 class="box-title">{{ 'expense_per_destination_account'|_ }}</h2>
                 </div>
                 <div class="box-body">
                     <div style="width:100%;margin:0 auto;">
@@ -107,7 +107,7 @@
             <div class="col-lg-12">
                 <div class="box main_budget_chart">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'expenses'|_ }} ({{ budget.name }})</h3>
+                        <h2 class="box-title">{{ 'expenses'|_ }} ({{ budget.name }})</h2>
                     </div>
                     <div class="box-body">
                         <canvas class="main_budget_canvas" data-url="{{ route('chart.budget.main', [accountIds, budget.id, start.format('Ymd'), end.format('Ymd')]) }}" id="in-out-chart-{{ budget.id }}" style="width:100%;height:400px;" height="400" width="100%"></canvas>
@@ -120,7 +120,7 @@
         <div class="col-lg-6">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'average_spending_per_destination'|_ }}</h3>
+                    <h2 class="box-title">{{ 'average_spending_per_destination'|_ }}</h2>
                 </div>
                 <div class="box-body table-responsive no-padding" id="avgExpensesHolder">
                 </div>
@@ -134,7 +134,7 @@
 
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'expenses'|_ }} ({{ trans('firefly.topX', {number: listLength}) }})</h3>
+                    <h2 class="box-title">{{ 'expenses'|_ }} ({{ trans('firefly.topX', {number: listLength}) }})</h2>
                 </div>
                 <div class="box-body table-responsive no-padding" id="topExpensesHolder">
                 </div>
diff --git a/resources/views/reports/budget/partials/account-per-budget.twig b/resources/views/reports/budget/partials/account-per-budget.twig
index 0266078590e..779c4608c48 100644
--- a/resources/views/reports/budget/partials/account-per-budget.twig
+++ b/resources/views/reports/budget/partials/account-per-budget.twig
@@ -1,9 +1,9 @@
-<table class="table table-hover sortable">
+<table class="table table-hover sortable" aria-label="{{ 'budget_account_overview'|_ }}">
     <thead>
     <tr>
-        <th data-defaultsign="az">{{ 'name'|_ }}</th>
+        <th data-defaultsign="az" scope="col">{{ 'name'|_ }}</th>
         {% for budget in budgets %}
-            <th data-defaultsign="_19" style="text-align: right;">{{ budget.name }}</th>
+            <th data-defaultsign="_19" style="text-align: right;" scope="col">{{ budget.name }}</th>
         {% endfor %}
     </tr>
     </thead>
diff --git a/resources/views/reports/budget/partials/accounts.twig b/resources/views/reports/budget/partials/accounts.twig
index cb21e4f5f52..98b732c338e 100644
--- a/resources/views/reports/budget/partials/accounts.twig
+++ b/resources/views/reports/budget/partials/accounts.twig
@@ -1,8 +1,8 @@
-<table class="table table-hover sortable">
+<table class="table table-hover sortable" aria-label="{{ 'budget_accounts_table'|_ }}">
     <thead>
     <tr>
-        <th data-defaultsign="az">{{ 'name'|_ }}</th>
-        <th data-defaultsign="_19" style="text-align: right;">{{ 'spent'|_ }}</th>
+        <th data-defaultsign="az" scope="col">{{ 'name'|_ }}</th>
+        <th data-defaultsign="_19" style="text-align: right;" scope="col">{{ 'spent'|_ }}</th>
     </tr>
     </thead>
     <tbody>
diff --git a/resources/views/reports/budget/partials/avg-expenses.twig b/resources/views/reports/budget/partials/avg-expenses.twig
index b34a2ecc636..361992e1a33 100644
--- a/resources/views/reports/budget/partials/avg-expenses.twig
+++ b/resources/views/reports/budget/partials/avg-expenses.twig
@@ -1,10 +1,10 @@
-<table class="table table-hover sortable">
+<table class="table table-hover sortable" aria-label="{{ 'budget_expenses_table'|_ }}">
     <thead>
     <tr>
-        <th data-defaultsign="az">{{ 'account'|_ }}</th>
-        <th data-defaultsign="_19" style="text-align: right;">{{ 'spent_average'|_ }}</th>
-        <th data-defaultsign="_19" style="text-align: right;">{{ 'total'|_ }}</th>
-        <th data-defaultsign="_19">{{ 'transaction_count'|_ }}</th>
+        <th scope="col" data-defaultsign="az">{{ 'account'|_ }}</th>
+        <th scope="col" data-defaultsign="_19" style="text-align: right;">{{ 'spent_average'|_ }}</th>
+        <th scope="col" data-defaultsign="_19" style="text-align: right;">{{ 'total'|_ }}</th>
+        <th scope="col" data-defaultsign="_19">{{ 'transaction_count'|_ }}</th>
     </tr>
     </thead>
     <tbody>
diff --git a/resources/views/reports/budget/partials/budgets.twig b/resources/views/reports/budget/partials/budgets.twig
index 66dab99ab51..9d2a6c74051 100644
--- a/resources/views/reports/budget/partials/budgets.twig
+++ b/resources/views/reports/budget/partials/budgets.twig
@@ -1,9 +1,9 @@
-<table class="table table-hover sortable">
+<table class="table table-hover sortable" aria-label="{{ 'budget_report_table'|_ }}">
     <thead>
     <tr>
-        <th data-defaultsign="az">{{ 'name'|_ }}</th>
-        <th data-defaultsign="_19" style="text-align: right;">{{ 'spent'|_ }}</th>
-        <th data-defaultsign="_19">{{ trans('list.percentage') }}</th>
+        <th data-defaultsign="az" scope="col">{{ 'name'|_ }}</th>
+        <th data-defaultsign="_19" style="text-align: right;" scope="col">{{ 'spent'|_ }}</th>
+        <th data-defaultsign="_19" scope="col">{{ trans('list.percentage') }}</th>
     </tr>
     </thead>
     <tbody>
diff --git a/resources/views/reports/budget/partials/top-expenses.twig b/resources/views/reports/budget/partials/top-expenses.twig
index 8b5d71bd6b5..9e2c8a4ca61 100644
--- a/resources/views/reports/budget/partials/top-expenses.twig
+++ b/resources/views/reports/budget/partials/top-expenses.twig
@@ -1,11 +1,11 @@
-<table class="table table-hover sortable">
+<table class="table table-hover sortable" aria-label="{{ 'top_expenses_table'|_ }}">
     <thead>
     <tr>
-        <th data-defaultsort="disabled">{{ 'description'|_ }}</th>
-        <th data-defaultsign="month">{{ 'date'|_ }}</th>
-        <th data-defaultsign="az">{{ 'account'|_ }}</th>
-        <th data-defaultsign="az">{{ 'budget'|_ }}</th>
-        <th data-defaultsign="_19" style="text-align: right;">{{ 'amount'|_ }}</th>
+        <th scope="col" data-defaultsort="disabled">{{ 'description'|_ }}</th>
+        <th scope="col" data-defaultsign="month">{{ 'date'|_ }}</th>
+        <th scope="col" data-defaultsign="az">{{ 'account'|_ }}</th>
+        <th scope="col" data-defaultsign="az">{{ 'budget'|_ }}</th>
+        <th scope="col" data-defaultsign="_19" style="text-align: right;">{{ 'amount'|_ }}</th>
     </tr>
     </thead>
     <tbody>
diff --git a/resources/views/reports/category/month.twig b/resources/views/reports/category/month.twig
index c6a02692f24..c8b5459aa8c 100644
--- a/resources/views/reports/category/month.twig
+++ b/resources/views/reports/category/month.twig
@@ -5,12 +5,17 @@
 {% endblock %}
 
 {% block content %}
+    <div class="row">
+        <div class="col-lg-12">
+            <h1 class="sr-only">{{ 'category_report'|_ }}</h1>
+        </div>
+    </div>
 
     <div class="row">
         <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'accounts'|_ }}</h3>
+                    <h2 class="box-title">{{ 'accounts'|_ }}</h2>
                 </div>
                 <div class="box-body table-responsive no-padding" id="accountsHolder">
                 </div>
@@ -23,7 +28,7 @@
         <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'categories'|_ }}</h3>
+                    <h2 class="box-title">{{ 'categories'|_ }}</h2>
                 </div>
                 <div class="box-body table-responsive no-padding" id="categoriesHolder">
                 </div>
@@ -38,7 +43,7 @@
         <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'account_per_category'|_ }}</h3>
+                    <h2 class="box-title">{{ 'account_per_category'|_ }}</h2>
                 </div>
                 <div class="box-body table-responsive no-padding" id="accountPerCategoryHolder">
                 </div>
diff --git a/resources/views/reports/category/partials/account-per-category.twig b/resources/views/reports/category/partials/account-per-category.twig
index cb960c33bb6..e334129f52f 100644
--- a/resources/views/reports/category/partials/account-per-category.twig
+++ b/resources/views/reports/category/partials/account-per-category.twig
@@ -1,9 +1,9 @@
-<table class="table table-hover sortable">
+<table class="table table-hover sortable" aria-label="{{ 'account_per_category_table'|_ }}">
     <thead>
     <tr>
-        <th data-defaultsign="az">{{ 'name'|_ }}</th>
+        <th data-defaultsign="az" scope="col">{{ 'name'|_ }}</th>
         {% for category in categories %}
-            <th data-defaultsign="_19" style="text-align: right;">{{ category.name }}</th>
+            <th data-defaultsign="_19" style="text-align: right;" scope="col">{{ category.name }}</th>
         {% endfor %}
     </tr>
     </thead>
diff --git a/resources/views/reports/category/partials/accounts.twig b/resources/views/reports/category/partials/accounts.twig
index 4e9ce9e9a2f..496a614808c 100644
--- a/resources/views/reports/category/partials/accounts.twig
+++ b/resources/views/reports/category/partials/accounts.twig
@@ -1,10 +1,10 @@
-<table class="table table-hover sortable">
+<table class="table table-hover sortable" aria-label="{{ 'category_accounts_table'|_ }}">
     <thead>
     <tr>
-        <th data-defaultsign="az">{{ 'name'|_ }}</th>
-        <th data-defaultsign="_19" style="text-align: right;">{{ 'spent'|_ }}</th>
-        <th data-defaultsign="_19" style="text-align: right;">{{ 'earned'|_ }}</th>
-        <th data-defaultsign="_19" style="text-align: right;">{{ 'sum'|_ }}</th>
+        <th data-defaultsign="az" scope="col">{{ 'name'|_ }}</th>
+        <th data-defaultsign="_19" style="text-align: right;" scope="col">{{ 'spent'|_ }}</th>
+        <th data-defaultsign="_19" style="text-align: right;" scope="col">{{ 'earned'|_ }}</th>
+        <th data-defaultsign="_19" style="text-align: right;" scope="col">{{ 'sum'|_ }}</th>
     </tr>
     </thead>
     <tbody>
diff --git a/resources/views/reports/category/partials/avg-expenses.twig b/resources/views/reports/category/partials/avg-expenses.twig
index b34a2ecc636..05ad85c74ac 100644
--- a/resources/views/reports/category/partials/avg-expenses.twig
+++ b/resources/views/reports/category/partials/avg-expenses.twig
@@ -1,10 +1,10 @@
-<table class="table table-hover sortable">
+<table class="table table-hover sortable" aria-label="{{ 'average_expenses_by_account'|_ }}">
     <thead>
     <tr>
-        <th data-defaultsign="az">{{ 'account'|_ }}</th>
-        <th data-defaultsign="_19" style="text-align: right;">{{ 'spent_average'|_ }}</th>
-        <th data-defaultsign="_19" style="text-align: right;">{{ 'total'|_ }}</th>
-        <th data-defaultsign="_19">{{ 'transaction_count'|_ }}</th>
+        <th data-defaultsign="az" scope="col">{{ 'account'|_ }}</th>
+        <th data-defaultsign="_19" style="text-align: right;" scope="col">{{ 'spent_average'|_ }}</th>
+        <th data-defaultsign="_19" style="text-align: right;" scope="col">{{ 'total'|_ }}</th>
+        <th data-defaultsign="_19" scope="col">{{ 'transaction_count'|_ }}</th>
     </tr>
     </thead>
     <tbody>
diff --git a/resources/views/reports/category/partials/avg-income.twig b/resources/views/reports/category/partials/avg-income.twig
index b859f13a09c..0828406b59d 100644
--- a/resources/views/reports/category/partials/avg-income.twig
+++ b/resources/views/reports/category/partials/avg-income.twig
@@ -1,10 +1,10 @@
-<table class="table table-hover sortable">
+<table class="table table-hover sortable" aria-label="{{ 'average_income_by_account'|_ }}">
     <thead>
     <tr>
-        <th data-defaultsign="az">{{ 'account'|_ }}</th>
-        <th data-defaultsign="_19" style="text-align: right;">{{ 'spent_average'|_ }}</th>
-        <th data-defaultsign="_19" style="text-align: right;">{{ 'total'|_ }}</th>
-        <th data-defaultsign="_19">{{ 'transaction_count'|_ }}</th>
+        <th data-defaultsign="az" scope="col">{{ 'account'|_ }}</th>
+        <th data-defaultsign="_19" style="text-align: right;" scope="col">{{ 'spent_average'|_ }}</th>
+        <th data-defaultsign="_19" style="text-align: right;" scope="col">{{ 'total'|_ }}</th>
+        <th data-defaultsign="_19" scope="col">{{ 'transaction_count'|_ }}</th>
     </tr>
     </thead>
     <tbody>
diff --git a/resources/views/reports/category/partials/categories.twig b/resources/views/reports/category/partials/categories.twig
index 08462940494..cb489df78ef 100644
--- a/resources/views/reports/category/partials/categories.twig
+++ b/resources/views/reports/category/partials/categories.twig
@@ -1,10 +1,10 @@
-<table class="table table-hover sortable">
+<table class="table table-hover sortable" aria-label="{{ 'category_report_table'|_ }}">
     <thead>
     <tr>
-        <th data-defaultsign="az">{{ 'name'|_ }}</th>
-        <th data-defaultsign="_19" style="text-align: right;">{{ 'spent'|_ }}</th>
-        <th data-defaultsign="_19" style="text-align: right;">{{ 'earned'|_ }}</th>
-        <th data-defaultsign="_19" style="text-align: right;">{{ 'sum'|_ }}</th>
+        <th data-defaultsign="az" scope="col">{{ 'name'|_ }}</th>
+        <th data-defaultsign="_19" style="text-align: right;" scope="col">{{ 'spent'|_ }}</th>
+        <th data-defaultsign="_19" style="text-align: right;" scope="col">{{ 'earned'|_ }}</th>
+        <th data-defaultsign="_19" style="text-align: right;" scope="col">{{ 'sum'|_ }}</th>
     </tr>
     </thead>
     <tbody>
diff --git a/resources/views/reports/category/partials/top-expenses.twig b/resources/views/reports/category/partials/top-expenses.twig
index f435d41189d..3aba3dc02e6 100644
--- a/resources/views/reports/category/partials/top-expenses.twig
+++ b/resources/views/reports/category/partials/top-expenses.twig
@@ -1,11 +1,11 @@
-<table class="table table-hover sortable">
+<table class="table table-hover sortable" aria-label="{{ 'top_expenses_table'|_ }}">
     <thead>
     <tr>
-        <th data-defaultsort="disabled">{{ 'description'|_ }}</th>
-        <th data-defaultsign="month">{{ 'date'|_ }}</th>
-        <th data-defaultsign="az">{{ 'account'|_ }}</th>
-        <th data-defaultsign="az">{{ 'category'|_ }}</th>
-        <th data-defaultsign="_19" style="text-align: right;">{{ 'amount'|_ }}</th>
+        <th scope="col" data-defaultsort="disabled">{{ 'description'|_ }}</th>
+        <th scope="col" data-defaultsign="month">{{ 'date'|_ }}</th>
+        <th scope="col" data-defaultsign="az">{{ 'account'|_ }}</th>
+        <th scope="col" data-defaultsign="az">{{ 'category'|_ }}</th>
+        <th scope="col" data-defaultsign="_19" style="text-align: right;">{{ 'amount'|_ }}</th>
     </tr>
     </thead>
     <tbody>
diff --git a/resources/views/reports/category/partials/top-income.twig b/resources/views/reports/category/partials/top-income.twig
index e5d566d4682..621f072a124 100644
--- a/resources/views/reports/category/partials/top-income.twig
+++ b/resources/views/reports/category/partials/top-income.twig
@@ -1,11 +1,11 @@
-<table class="table table-hover sortable">
+<table class="table table-hover sortable" aria-label="{{ 'top_income_transactions'|_ }}">
     <thead>
     <tr>
-        <th data-defaultsort="disabled">{{ 'description'|_ }}</th>
-        <th data-defaultsign="month">{{ 'date'|_ }}</th>
-        <th data-defaultsign="az">{{ 'account'|_ }}</th>
-        <th data-defaultsign="az">{{ 'category'|_ }}</th>
-        <th data-defaultsign="_19" style="text-align: right;">{{ 'amount'|_ }}</th>
+        <th data-defaultsort="disabled" scope="col">{{ 'description'|_ }}</th>
+        <th data-defaultsign="month" scope="col">{{ 'date'|_ }}</th>
+        <th data-defaultsign="az" scope="col">{{ 'account'|_ }}</th>
+        <th data-defaultsign="az" scope="col">{{ 'category'|_ }}</th>
+        <th data-defaultsign="_19" style="text-align: right;" scope="col">{{ 'amount'|_ }}</th>
     </tr>
     </thead>
     <tbody>
diff --git a/resources/views/reports/default/month.twig b/resources/views/reports/default/month.twig
index 687c45a1d4c..6275a38e264 100644
--- a/resources/views/reports/default/month.twig
+++ b/resources/views/reports/default/month.twig
@@ -11,7 +11,7 @@
         <div class="col-lg-12 col-md-12 col-sm-12">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'accountBalances'|_ }}</h3>
+                    <h2 class="box-title">{{ 'accountBalances'|_ }}</h2>
                 </div>
                 <div class="box-body">
                     <canvas id="account-balances-chart" style="width:100%;height:400px;" height="400" width="100%"></canvas>
@@ -25,7 +25,7 @@
         <div class="col-lg-6 col-md-6 col-sm-6">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'accountBalances'|_ }}</h3>
+                    <h2 class="box-title">{{ 'accountBalances'|_ }}</h2>
                 </div>
                 <div class="box-body table-responsive no-padding" id="accountReport">
                 </div>
@@ -38,7 +38,7 @@
         <div class="col-lg-6 col-md-6 col-sm-6">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'incomeVsExpenses'|_ }}</h3>
+                    <h2 class="box-title">{{ 'incomeVsExpenses'|_ }}</h2>
                 </div>
                 <div class="box-body table-responsive no-padding" id="incomeVsExpenseReport">
                 </div>
@@ -55,7 +55,7 @@
         <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'income'|_ }}</h3>
+                    <h2 class="box-title">{{ 'income'|_ }}</h2>
                 </div>
                 <div class="box-body table-responsive no-padding" id="incomeReport">
                 </div>
@@ -68,7 +68,7 @@
         <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'expenses'|_ }}</h3>
+                    <h2 class="box-title">{{ 'expenses'|_ }}</h2>
                 </div>
                 <div class="box-body table-responsive no-padding" id="expenseReport">
                 </div>
@@ -85,7 +85,7 @@
             <div class="box">
 
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'budgets'|_ }}</h3>
+                    <h2 class="box-title">{{ 'budgets'|_ }}</h2>
                 </div>
                 <div class="box-body table-responsive no-padding" id="budgetReport">
                 </div>
@@ -100,7 +100,7 @@
         <div class="col-lg-4 col-md-4 col-sm-12">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'categories'|_ }}</h3>
+                    <h2 class="box-title">{{ 'categories'|_ }}</h2>
                 </div>
                 <div class="box-body table-responsive no-padding" id="categoryReport"></div>
                 {# loading indicator #}
@@ -114,7 +114,7 @@
         <div class="col-lg-12 col-md-12 col-sm-12">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'budgets'|_ }} ({{ 'splitByAccount'|_|lower }})</h3>
+                    <h2 class="box-title">{{ 'budgets'|_ }} ({{ 'splitByAccount'|_|lower }})</h2>
                 </div>
                 <div class="box-body table-responsive no-padding" id="balanceReport">
                 </div>
@@ -130,7 +130,7 @@
         <div class="col-lg-12 col-md-12 col-sm-12">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'bills'|_ }}</h3>
+                    <h2 class="box-title">{{ 'bills'|_ }}</h2>
                 </div>
                 <div class="box-body table-responsive no-padding" id="billReport"></div>
                 {# loading indicator #}
diff --git a/resources/views/reports/default/multi-year.twig b/resources/views/reports/default/multi-year.twig
index be76587ad07..cb2e8232857 100644
--- a/resources/views/reports/default/multi-year.twig
+++ b/resources/views/reports/default/multi-year.twig
@@ -6,12 +6,14 @@
 
 {% block content %}
 
+    <h1 class="sr-only">{{ 'multi_year_report'|_ }}</h1>
+
     {# charts #}
     <div class="row">
         <div class="col-lg-12 col-md-12 col-sm-12">
             <div class="box" id="year-inc-exp">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'incomeVsExpenses'|_ }}</h3>
+                    <h2 class="box-title">{{ 'incomeVsExpenses'|_ }}</h2>
                 </div>
                 <div class="box-body">
                     <canvas id="income-expenses-chart" style="width:100%;height:400px;" height="400" width="100%"></canvas>
@@ -25,7 +27,7 @@
         <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'accountBalances'|_ }}</h3>
+                    <h2 class="box-title">{{ 'accountBalances'|_ }}</h2>
                 </div>
                 <div class="box-body table-responsive no-padding" id="accountReport">
                 </div>
@@ -38,7 +40,7 @@
         <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'incomeVsExpenses'|_ }}</h3>
+                    <h2 class="box-title">{{ 'incomeVsExpenses'|_ }}</h2>
                 </div>
                 <div class="box-body table-responsive no-padding" id="incomeVsExpenseReport">
                 </div>
@@ -55,7 +57,7 @@
         <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'income'|_ }}</h3>
+                    <h2 class="box-title">{{ 'income'|_ }}</h2>
                 </div>
                 <div class="box-body table-responsive no-padding" id="incomeReport">
                 </div>
@@ -69,7 +71,7 @@
         <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'expenses'|_ }}</h3>
+                    <h2 class="box-title">{{ 'expenses'|_ }}</h2>
                 </div>
                 <div class="box-body table-responsive no-padding" id="expenseReport">
                 </div>
@@ -86,7 +88,7 @@
         <div class="col-lg-12 col-md-12 col-sm-12">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'net_worth'|_ }}</h3>
+                    <h2 class="box-title">{{ 'net_worth'|_ }}</h2>
                 </div>
                 <div class="box-body">
                     <canvas id="net-worth" style="width:100%;height:400px;" height="400" width="100%"></canvas>
@@ -106,7 +108,7 @@
         <div class="col-lg-12 col-md-12 col-sm-12">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'budgets'|_ }}</h3>
+                    <h2 class="box-title">{{ 'budgets'|_ }}</h2>
                 </div>
                 <div class="box-body no-padding table-responsive" id="budgetPeriodReport">
                 </div>
@@ -124,7 +126,7 @@
         <div class="col-lg-12 col-md-12 col-sm-12">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'chart'|_ }}</h3>
+                    <h2 class="box-title">{{ 'chart'|_ }}</h2>
                 </div>
                 <div class="box-body">
                     <p id="budget_help" class="text-muted text-center">{{ 'budget_chart_click'|_ }}</p>
@@ -139,7 +141,7 @@
         <div class="col-lg-12 col-md-12 col-sm-12">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'categories'|_ }} ({{ 'expenses'|_ }})</h3>
+                    <h2 class="box-title">{{ 'categories'|_ }} ({{ 'expenses'|_ }})</h2>
                 </div>
                 <div class="box-body no-padding table-responsive" id="categoryExpense">
                 </div>
@@ -156,7 +158,7 @@
         <div class="col-lg-12 col-md-12 col-sm-12">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'categories'|_ }} ({{ 'income'|_ }})</h3>
+                    <h2 class="box-title">{{ 'categories'|_ }} ({{ 'income'|_ }})</h2>
                 </div>
                 <div class="box-body no-padding table-responsive" id="categoryIncome">
                 </div>
@@ -173,7 +175,7 @@
         <div class="col-lg-12 col-md-12 col-sm-12">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'chart'|_ }}</h3>
+                    <h2 class="box-title">{{ 'chart'|_ }}</h2>
                 </div>
                 <div class="box-body">
                     <p id="category_help" class="text-muted text-center">{{ 'category_chart_click'|_ }}</p>
diff --git a/resources/views/reports/double/partials/accounts-per-asset.twig b/resources/views/reports/double/partials/accounts-per-asset.twig
index 6a19774fbf9..4b11f5f6947 100644
--- a/resources/views/reports/double/partials/accounts-per-asset.twig
+++ b/resources/views/reports/double/partials/accounts-per-asset.twig
@@ -1,10 +1,10 @@
-<table class="table table-hover sortable">
+<table class="table table-hover sortable" aria-label="{{ 'accounts_per_asset_table'|_ }}">
     <thead>
     <tr>
-        <th data-defaultsign="az">{{ 'name'|_ }}</th>
-        <th data-defaultsign="_19" style="text-align: right;">{{ 'spent'|_ }}</th>
-        <th data-defaultsign="_19" style="text-align: right;">{{ 'earned'|_ }}</th>
-        <th data-defaultsign="_19" style="text-align: right;">{{ 'sum'|_ }}</th>
+        <th scope="col" data-defaultsign="az">{{ 'name'|_ }}</th>
+        <th scope="col" data-defaultsign="_19" style="text-align: right;">{{ 'spent'|_ }}</th>
+        <th scope="col" data-defaultsign="_19" style="text-align: right;">{{ 'earned'|_ }}</th>
+        <th scope="col" data-defaultsign="_19" style="text-align: right;">{{ 'sum'|_ }}</th>
     </tr>
     </thead>
     <tbody>
diff --git a/resources/views/reports/double/partials/accounts.twig b/resources/views/reports/double/partials/accounts.twig
index 7149f2f45e3..38e91f1dba2 100644
--- a/resources/views/reports/double/partials/accounts.twig
+++ b/resources/views/reports/double/partials/accounts.twig
@@ -1,10 +1,10 @@
-<table class="table table-hover sortable">
+<table class="table table-hover sortable" aria-label="{{ 'accounts_report_table'|_ }}">
     <thead>
     <tr>
-        <th data-defaultsign="az">{{ 'name'|_ }}</th>
-        <th data-defaultsign="_19" style="text-align: right;">{{ 'spent'|_ }}</th>
-        <th data-defaultsign="_19" style="text-align: right;">{{ 'earned'|_ }}</th>
-        <th data-defaultsign="_19" style="text-align: right;">{{ 'sum'|_ }}</th>
+        <th data-defaultsign="az" scope="col">{{ 'name'|_ }}</th>
+        <th data-defaultsign="_19" style="text-align: right;" scope="col">{{ 'spent'|_ }}</th>
+        <th data-defaultsign="_19" style="text-align: right;" scope="col">{{ 'earned'|_ }}</th>
+        <th data-defaultsign="_19" style="text-align: right;" scope="col">{{ 'sum'|_ }}</th>
     </tr>
     </thead>
     <tbody>
diff --git a/resources/views/reports/double/partials/avg-expenses.twig b/resources/views/reports/double/partials/avg-expenses.twig
index b859f13a09c..fd8957556d2 100644
--- a/resources/views/reports/double/partials/avg-expenses.twig
+++ b/resources/views/reports/double/partials/avg-expenses.twig
@@ -1,10 +1,10 @@
-<table class="table table-hover sortable">
+<table class="table table-hover sortable" aria-label="{{ 'average_expenses_table'|_ }}">
     <thead>
     <tr>
-        <th data-defaultsign="az">{{ 'account'|_ }}</th>
-        <th data-defaultsign="_19" style="text-align: right;">{{ 'spent_average'|_ }}</th>
-        <th data-defaultsign="_19" style="text-align: right;">{{ 'total'|_ }}</th>
-        <th data-defaultsign="_19">{{ 'transaction_count'|_ }}</th>
+        <th data-defaultsign="az" scope="col">{{ 'account'|_ }}</th>
+        <th data-defaultsign="_19" style="text-align: right;" scope="col">{{ 'spent_average'|_ }}</th>
+        <th data-defaultsign="_19" style="text-align: right;" scope="col">{{ 'total'|_ }}</th>
+        <th data-defaultsign="_19" scope="col">{{ 'transaction_count'|_ }}</th>
     </tr>
     </thead>
     <tbody>
diff --git a/resources/views/reports/double/partials/avg-income.twig b/resources/views/reports/double/partials/avg-income.twig
index b34a2ecc636..e7a33d29604 100644
--- a/resources/views/reports/double/partials/avg-income.twig
+++ b/resources/views/reports/double/partials/avg-income.twig
@@ -1,10 +1,10 @@
-<table class="table table-hover sortable">
+<table class="table table-hover sortable" aria-label="{{ 'average_income_table'|_ }}">
     <thead>
     <tr>
-        <th data-defaultsign="az">{{ 'account'|_ }}</th>
-        <th data-defaultsign="_19" style="text-align: right;">{{ 'spent_average'|_ }}</th>
-        <th data-defaultsign="_19" style="text-align: right;">{{ 'total'|_ }}</th>
-        <th data-defaultsign="_19">{{ 'transaction_count'|_ }}</th>
+        <th data-defaultsign="az" scope="col">{{ 'account'|_ }}</th>
+        <th data-defaultsign="_19" style="text-align: right;" scope="col">{{ 'spent_average'|_ }}</th>
+        <th data-defaultsign="_19" style="text-align: right;" scope="col">{{ 'total'|_ }}</th>
+        <th data-defaultsign="_19" scope="col">{{ 'transaction_count'|_ }}</th>
     </tr>
     </thead>
     <tbody>
diff --git a/resources/views/reports/double/partials/top-expenses.twig b/resources/views/reports/double/partials/top-expenses.twig
index 8c957eb6e31..e7339f78de5 100644
--- a/resources/views/reports/double/partials/top-expenses.twig
+++ b/resources/views/reports/double/partials/top-expenses.twig
@@ -1,11 +1,11 @@
-<table class="table table-hover sortable">
+<table class="table table-hover sortable" aria-label="{{ 'top_expenses_table'|_ }}">
     <thead>
     <tr>
-        <th data-defaultsort="disabled">{{ 'description'|_ }}</th>
-        <th data-defaultsign="month">{{ 'date'|_ }}</th>
-        <th data-defaultsign="az">{{ 'source_account'|_ }}</th>
-        <th data-defaultsign="az">{{ 'destination_account'|_ }}</th>
-        <th data-defaultsign="_19" style="text-align: right;">{{ 'amount'|_ }}</th>
+        <th scope="col" data-defaultsort="disabled">{{ 'description'|_ }}</th>
+        <th scope="col" data-defaultsign="month">{{ 'date'|_ }}</th>
+        <th scope="col" data-defaultsign="az">{{ 'source_account'|_ }}</th>
+        <th scope="col" data-defaultsign="az">{{ 'destination_account'|_ }}</th>
+        <th scope="col" data-defaultsign="_19" style="text-align: right;">{{ 'amount'|_ }}</th>
     </tr>
     </thead>
     <tbody>
diff --git a/resources/views/reports/double/partials/top-income.twig b/resources/views/reports/double/partials/top-income.twig
index 8c957eb6e31..c677b8345b3 100644
--- a/resources/views/reports/double/partials/top-income.twig
+++ b/resources/views/reports/double/partials/top-income.twig
@@ -1,11 +1,11 @@
-<table class="table table-hover sortable">
+<table class="table table-hover sortable" aria-label="{{ 'top_income_transactions'|_ }}">
     <thead>
     <tr>
-        <th data-defaultsort="disabled">{{ 'description'|_ }}</th>
-        <th data-defaultsign="month">{{ 'date'|_ }}</th>
-        <th data-defaultsign="az">{{ 'source_account'|_ }}</th>
-        <th data-defaultsign="az">{{ 'destination_account'|_ }}</th>
-        <th data-defaultsign="_19" style="text-align: right;">{{ 'amount'|_ }}</th>
+        <th scope="col" data-defaultsort="disabled">{{ 'description'|_ }}</th>
+        <th scope="col" data-defaultsign="month">{{ 'date'|_ }}</th>
+        <th scope="col" data-defaultsign="az">{{ 'source_account'|_ }}</th>
+        <th scope="col" data-defaultsign="az">{{ 'destination_account'|_ }}</th>
+        <th scope="col" data-defaultsign="_19" style="text-align: right;">{{ 'amount'|_ }}</th>
     </tr>
     </thead>
     <tbody>
diff --git a/resources/views/reports/double/report.twig b/resources/views/reports/double/report.twig
index 602d2b1de2d..abf7cbcd055 100644
--- a/resources/views/reports/double/report.twig
+++ b/resources/views/reports/double/report.twig
@@ -10,7 +10,7 @@
         <div class="col-lg-6 col-md-12 col-sm-12 col-xs-12">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'in_out_accounts'|_ }}</h3>
+                    <h2 class="box-title">{{ 'in_out_accounts'|_ }}</h2>
                 </div>
                 <div class="box-body table-responsive no-padding" id="opsAccounts">
                     {# loading indicator #}
@@ -24,7 +24,7 @@
         <div class="col-lg-6 col-md-12 col-sm-12 col-xs-12">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'in_out_accounts_per_asset'|_ }}</h3>
+                    <h2 class="box-title">{{ 'in_out_accounts_per_asset'|_ }}</h2>
                 </div>
                 <div class="box-body table-responsive no-padding" id="opsAccountsAsset">
                     {# loading indicator #}
@@ -40,7 +40,7 @@
         <div class="col-lg-4 col-md-6">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'expense_per_category'|_ }}</h3>
+                    <h2 class="box-title">{{ 'expense_per_category'|_ }}</h2>
                 </div>
                 <div class="box-body">
                     <div style="width:100%;margin:0 auto;">
@@ -52,7 +52,7 @@
         <div class="col-lg-4 col-md-6">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'income_per_category'|_ }}</h3>
+                    <h2 class="box-title">{{ 'income_per_category'|_ }}</h2>
                 </div>
                 <div class="box-body">
                     <div style="width:100%;margin:0 auto;">
@@ -64,7 +64,7 @@
         <div class="col-lg-4 col-md-6">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'expense_per_budget'|_ }}</h3>
+                    <h2 class="box-title">{{ 'expense_per_budget'|_ }}</h2>
                 </div>
                 <div class="box-body">
                     <div style="width:100%;margin:0 auto;">
@@ -79,7 +79,7 @@
         <div class="col-lg-6 col-md-6">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'expense_per_tag'|_ }}</h3>
+                    <h2 class="box-title">{{ 'expense_per_tag'|_ }}</h2>
                 </div>
                 <div class="box-body">
                     <div style="width:100%;margin:0 auto;">
@@ -96,7 +96,7 @@
         <div class="col-lg-6 col-md-6">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'income_per_tag'|_ }}</h3>
+                    <h2 class="box-title">{{ 'income_per_tag'|_ }}</h2>
                 </div>
                 <div class="box-body">
                     <div style="width:100%;margin:0 auto;">
@@ -118,7 +118,7 @@
             <div class="col-lg-12">
                 <div class="box" id="incomeAndExpensesChart">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'income_and_expenses'|_ }} ({{ account.name }}) {% if account.iban %}({{ account.iban }}){% endif %}</h3>
+                        <h2 class="box-title">{{ 'income_and_expenses'|_ }} ({{ account.name }}) {% if account.iban %}({{ account.iban }}){% endif %}</h2>
                     </div>
                     <div class="box-body">
                         <canvas class="main_double_canvas"
@@ -134,7 +134,7 @@
         <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'expenses'|_ }} ({{ trans('firefly.topX', {number: listLength}) }})</h3>
+                    <h2 class="box-title">{{ 'expenses'|_ }} ({{ trans('firefly.topX', {number: listLength}) }})</h2>
                 </div>
                 <div class="box-body table-responsive no-padding" id="topExpensesHolder">
                     {# loading indicator #}
@@ -148,7 +148,7 @@
         <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'income'|_ }} ({{ trans('firefly.topX', {number: listLength}) }})</h3>
+                    <h2 class="box-title">{{ 'income'|_ }} ({{ trans('firefly.topX', {number: listLength}) }})</h2>
                 </div>
                 <div class="box-body table-responsive no-padding" id="topIncomeHolder">
                     {# loading indicator #}
@@ -164,7 +164,7 @@
         <div class="col-lg-6">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'average_spending_per_source'|_ }}</h3>
+                    <h2 class="box-title">{{ 'average_spending_per_source'|_ }}</h2>
                 </div>
                 <div class="box-body table-responsive no-padding" id="avgExpensesHolder">
                 </div>
diff --git a/resources/views/reports/index.twig b/resources/views/reports/index.twig
index 15acad7e561..dde81780202 100644
--- a/resources/views/reports/index.twig
+++ b/resources/views/reports/index.twig
@@ -5,13 +5,14 @@
 {% endblock %}
 
 {% block content %}
+    <h1 class="sr-only">{{ 'reports'|_ }}</h1>
 
     <div class="row">
         <form class="form-horizontal nodisablebutton" id="report-form" action="{{ route('reports.index.post') }}" method="post">
             <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'reports'|_ }}</h3>
+                        <h2 class="box-title">{{ 'reports'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         <p class="text-info">
@@ -96,7 +97,7 @@
                 </div>
                 <div class="box" id="extra-options-box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'reports_extra_options'|_ }}</h3>
+                        <h2 class="box-title">{{ 'reports_extra_options'|_ }}</h2>
                     </div>
                     <div class="box-body" id="extra-options">
                     </div>
@@ -108,7 +109,7 @@
 
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'reports_submit'|_ }}</h3>
+                        <h2 class="box-title">{{ 'reports_submit'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         <div class="form-group">
@@ -125,7 +126,7 @@
         <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'quick_link_reports'|_ }}</h3>
+                    <h2 class="box-title">{{ 'quick_link_reports'|_ }}</h2>
                 </div>
                 <div class="box-body">
                     {% if '' == accountList %}
@@ -137,7 +138,7 @@
                     <p>
                         {{ 'quick_link_examples'|_ }}
                     </p>
-                    <h4>{{ ('quick_link_default_report')|_ }}</h4>
+                    <h3>{{ ('quick_link_default_report')|_ }}</h3>
                     <ul>
                         <li>
                             <a href="{{ route('reports.report.default',[accountList, 'currentMonthStart','currentMonthEnd']) }}">{{ 'report_this_month_quick'|_ }}</a>
@@ -158,7 +159,7 @@
                         </li>
                     </ul>
 
-                    <h4>{{ ('quick_link_audit_report')|_ }}</h4>
+                    <h3>{{ ('quick_link_audit_report')|_ }}</h3>
                     <ul>
                         <li>
                             <a href="{{ route('reports.report.audit',[accountList, 'currentMonthStart','currentMonthEnd']) }}">{{ 'report_this_month_quick'|_ }}</a>
diff --git a/resources/views/reports/partials/accounts.twig b/resources/views/reports/partials/accounts.twig
index 53a9e5e0c5e..1eaee1f006f 100644
--- a/resources/views/reports/partials/accounts.twig
+++ b/resources/views/reports/partials/accounts.twig
@@ -1,10 +1,10 @@
-<table class="table table-hover sortable">
+<table class="table table-hover sortable" aria-label="{{ 'account_balance_report'|_ }}">
     <thead>
     <tr>
-        <th data-defaultsign="az">{{ 'name'|_ }}</th>
-        <th data-defaultsign="_19" class="hidden-xs" style="text-align: right;">{{ 'balanceStart'|_ }}</th>
-        <th data-defaultsign="_19" class="hidden-xs" style="text-align: right;">{{ 'balanceEnd'|_ }}</th>
-        <th data-defaultsign="_19" style="text-align: right;">{{ 'difference'|_ }}</th>
+        <th data-defaultsign="az" scope="col">{{ 'name'|_ }}</th>
+        <th data-defaultsign="_19" class="hidden-xs" style="text-align: right;" scope="col">{{ 'balanceStart'|_ }}</th>
+        <th data-defaultsign="_19" class="hidden-xs" style="text-align: right;" scope="col">{{ 'balanceEnd'|_ }}</th>
+        <th data-defaultsign="_19" style="text-align: right;" scope="col">{{ 'difference'|_ }}</th>
     </tr>
     </thead>
     <tbody>
diff --git a/resources/views/reports/partials/balance.twig b/resources/views/reports/partials/balance.twig
index 36dc3bb0cad..e6ffcd39fb4 100644
--- a/resources/views/reports/partials/balance.twig
+++ b/resources/views/reports/partials/balance.twig
@@ -1,14 +1,14 @@
-<table class="table table-hover">
+<table class="table table-hover" aria-label="{{ 'budget_balance_table'|_ }}">
     <thead>
     <tr>
-        <th>{{ 'budgets'|_ }}</th>
+        <th scope="col">{{ 'budgets'|_ }}</th>
         {% for account in report.accounts %}
             {% if account.sum != 0 %}
-                <th class="hidden-xs" style="text-align: right;"><a href="{{ route('accounts.show',account.id) }}"
+                <th scope="col" class="hidden-xs" style="text-align: right;"><a href="{{ route('accounts.show',account.id) }}"
                                                                     title="{{ account.iban|default(account.name) }}">{{ account.name }}</a></th>
             {% endif %}
         {% endfor %}
-        <th style="text-align: right;">{{ 'sum'|_ }}</th>
+        <th scope="col" style="text-align: right;">{{ 'sum'|_ }}</th>
     </tr>
     </thead>
     <tbody>
diff --git a/resources/views/reports/partials/bills.twig b/resources/views/reports/partials/bills.twig
index 2f55e2bd6c1..f347440cc51 100644
--- a/resources/views/reports/partials/bills.twig
+++ b/resources/views/reports/partials/bills.twig
@@ -1,11 +1,11 @@
-<table class="table table-hover sortable">
+<table class="table table-hover sortable" aria-label="{{ 'bills_table'|_ }}">
     <thead>
     <tr>
-        <th data-defaultsign="az">{{ trans('form.name') }}</th>
-        <th data-defaultsign="_19" class="hidden-xs" style="text-align: right;">{{ trans('form.amount_min') }}</th>
-        <th data-defaultsign="_19" class="hidden-xs" style="text-align: right;">{{ trans('form.amount_max') }}</th>
-        <th data-defaultsign="_19">{{ trans('form.expected_on') }}</th>
-        <th data-defaultsign="_19" style="text-align: right;">{{ trans('form.paid') }}</th>
+        <th scope="col" data-defaultsign="az">{{ trans('form.name') }}</th>
+        <th scope="col" data-defaultsign="_19" class="hidden-xs" style="text-align: right;">{{ trans('form.amount_min') }}</th>
+        <th scope="col" data-defaultsign="_19" class="hidden-xs" style="text-align: right;">{{ trans('form.amount_max') }}</th>
+        <th scope="col" data-defaultsign="_19">{{ trans('form.expected_on') }}</th>
+        <th scope="col" data-defaultsign="_19" style="text-align: right;">{{ trans('form.paid') }}</th>
     </tr>
     </thead>
     <tbody>
diff --git a/resources/views/reports/partials/budget-period.twig b/resources/views/reports/partials/budget-period.twig
index bf672d0ab70..8cbd3b3fcb5 100644
--- a/resources/views/reports/partials/budget-period.twig
+++ b/resources/views/reports/partials/budget-period.twig
@@ -1,12 +1,12 @@
-<table class="table table-hover sortable">
+<table class="table table-hover sortable" aria-label="{{ 'budget_report_table'|_ }}">
     <thead>
     <tr>
-        <th data-defaultsign="az" colspan="2">{{ 'budget'|_ }}</th>
+        <th data-defaultsign="az" colspan="2" scope="col">{{ 'budget'|_ }}</th>
         {% for period in periods %}
-            <th data-defaultsign="_19" style="text-align: right;">{{ period }}</th>
+            <th data-defaultsign="_19" style="text-align: right;" scope="col">{{ period }}</th>
         {% endfor %}
-        <th data-defaultsign="_19" style="text-align: right;">{{ 'average'|_ }}</th>
-        <th data-defaultsign="_19" style="text-align: right;">{{ 'sum'|_ }}</th>
+        <th data-defaultsign="_19" style="text-align: right;" scope="col">{{ 'average'|_ }}</th>
+        <th data-defaultsign="_19" style="text-align: right;" scope="col">{{ 'sum'|_ }}</th>
     </tr>
     </thead>
     <tbody>
diff --git a/resources/views/reports/partials/budgets.twig b/resources/views/reports/partials/budgets.twig
index 86f393cdb26..6e894ab82fa 100644
--- a/resources/views/reports/partials/budgets.twig
+++ b/resources/views/reports/partials/budgets.twig
@@ -1,15 +1,15 @@
-<table class="table table-hover sortable">
+<table class="table table-hover sortable" aria-label="{{ 'budget_overview_table'|_ }}">
     <thead>
     <tr>
-        <th data-defaultsign="az">{{ 'budget'|_ }}</th>
-        <th data-defaultsign="month" class="hidden-xs">{{ 'date'|_ }}</th>
-        <th data-defaultsign="_19" style="text-align: right;" class="hidden-xs">{{ 'budgeted'|_ }}</th>
-        <th data-defaultsign="_19" class="hidden-xs">{{ trans('list.percentage') }}</th>
-        <th data-defaultsign="_19" style="text-align: right;">{{ 'spent'|_ }}</th>
-        <th data-defaultsign="_19" class="hidden-xs">{{ trans('list.percentage') }}</th>
-        <th data-defaultsort="disabled" class="hidden-xs">&nbsp;</th>
-        <th data-defaultsign="_19" style="text-align: right;" class="hidden-xs">{{ 'left'|_ }}</th>
-        <th data-defaultsign="_19" style="text-align: right;">{{ 'overspent'|_ }}</th>
+        <th data-defaultsign="az" scope="col">{{ 'budget'|_ }}</th>
+        <th data-defaultsign="month" class="hidden-xs" scope="col">{{ 'date'|_ }}</th>
+        <th data-defaultsign="_19" style="text-align: right;" class="hidden-xs" scope="col">{{ 'budgeted'|_ }}</th>
+        <th data-defaultsign="_19" class="hidden-xs" scope="col">{{ trans('list.percentage') }}</th>
+        <th data-defaultsign="_19" style="text-align: right;" scope="col">{{ 'spent'|_ }}</th>
+        <th data-defaultsign="_19" class="hidden-xs" scope="col">{{ trans('list.percentage') }}</th>
+        <th data-defaultsort="disabled" class="hidden-xs" scope="col">&nbsp;</th>
+        <th data-defaultsign="_19" style="text-align: right;" class="hidden-xs" scope="col">{{ 'left'|_ }}</th>
+        <th data-defaultsign="_19" style="text-align: right;" scope="col">{{ 'overspent'|_ }}</th>
     </tr>
     </thead>
     <tbody>
diff --git a/resources/views/reports/partials/categories.twig b/resources/views/reports/partials/categories.twig
index f45abde45d0..97cb9aa7ef5 100644
--- a/resources/views/reports/partials/categories.twig
+++ b/resources/views/reports/partials/categories.twig
@@ -1,11 +1,11 @@
-<table class="table table-hover sortable">
+<table class="table table-hover sortable" aria-label="{{ 'categories_report_table'|_ }}">
     <thead>
     <tr>
-        <th data-defaultsign="az">{{ 'category'|_ }}</th>
-        <th data-defaultsign="_19" style="text-align: right;">{{ 'spent'|_ }}</th>
-        <th data-defaultsign="_19" style="text-align: right;">{{ 'earned'|_ }}</th>
-        <th data-defaultsign="_19" style="text-align: right;">{{ 'sum'|_ }}</th>
-        <th data-defaultsort="disabled">&nbsp;</th>
+        <th data-defaultsign="az" scope="col">{{ 'category'|_ }}</th>
+        <th data-defaultsign="_19" style="text-align: right;" scope="col">{{ 'spent'|_ }}</th>
+        <th data-defaultsign="_19" style="text-align: right;" scope="col">{{ 'earned'|_ }}</th>
+        <th data-defaultsign="_19" style="text-align: right;" scope="col">{{ 'sum'|_ }}</th>
+        <th data-defaultsort="disabled" scope="col">&nbsp;</th>
     </tr>
     </thead>
     <tbody>
diff --git a/resources/views/reports/partials/category-period.twig b/resources/views/reports/partials/category-period.twig
index 2660eed70bc..4a624d9810f 100644
--- a/resources/views/reports/partials/category-period.twig
+++ b/resources/views/reports/partials/category-period.twig
@@ -1,11 +1,11 @@
-<table class="table table-hover sortable table-condensed">
+<table class="table table-hover sortable table-condensed" aria-label="{{ 'category_period_report_table'|_ }}">
     <thead>
     <tr>
-        <th data-defaultsign="az" colspan="2">{{ 'category'|_ }}</th>
+        <th data-defaultsign="az" colspan="2" scope="col">{{ 'category'|_ }}</th>
         {% for period in periods %}
-            <th data-defaultsign="_19" style="text-align: right;">{{ period }}</th>
+            <th data-defaultsign="_19" style="text-align: right;" scope="col">{{ period }}</th>
         {% endfor %}
-        <th data-defaultsign="_19" style="text-align: right;">{{ 'sum'|_ }}</th>
+        <th data-defaultsign="_19" style="text-align: right;" scope="col">{{ 'sum'|_ }}</th>
     </tr>
     </thead>
     <tbody>
diff --git a/resources/views/reports/partials/exp-budgets.twig b/resources/views/reports/partials/exp-budgets.twig
index d1cc577e1d4..665bc57d443 100644
--- a/resources/views/reports/partials/exp-budgets.twig
+++ b/resources/views/reports/partials/exp-budgets.twig
@@ -1,8 +1,8 @@
-<table class="table table-hover sortable">
+<table class="table table-hover sortable" aria-label="{{ 'budget_expenses_table'|_ }}">
     <thead>
     <tr>
-        <th style="width:66%;" data-defaultsign="az" data-defaultsort="asc">{{ 'category'|_ }}</th>
-        <th style="width:34%;" data-defaultsign="_19">{{ 'spent'|_ }}</th>
+        <th scope="col" style="width:66%;" data-defaultsign="az" data-defaultsort="asc">{{ 'category'|_ }}</th>
+        <th scope="col" style="width:34%;" data-defaultsign="_19">{{ 'spent'|_ }}</th>
     </tr>
     </thead>
     <tbody>
diff --git a/resources/views/reports/partials/exp-categories.twig b/resources/views/reports/partials/exp-categories.twig
index bfa38f242b4..83683c753f8 100644
--- a/resources/views/reports/partials/exp-categories.twig
+++ b/resources/views/reports/partials/exp-categories.twig
@@ -1,9 +1,9 @@
-<table class="table table-hover sortable">
+<table class="table table-hover sortable" aria-label="{{ 'expense_categories_table'|_ }}">
     <thead>
     <tr>
-        <th style="width:50%;" data-defaultsign="az" data-defaultsort="asc">{{ 'category'|_ }}</th>
-        <th style="width:25%;" data-defaultsign="_19">{{ 'spent'|_ }}</th>
-        <th style="width:25%;" data-defaultsign="_19">{{ 'earned'|_ }}</th>
+        <th scope="col" style="width:50%;" data-defaultsign="az" data-defaultsort="asc">{{ 'category'|_ }}</th>
+        <th scope="col" style="width:25%;" data-defaultsign="_19">{{ 'spent'|_ }}</th>
+        <th scope="col" style="width:25%;" data-defaultsign="_19">{{ 'earned'|_ }}</th>
     </tr>
     </thead>
     <tbody>
diff --git a/resources/views/reports/partials/exp-not-grouped.twig b/resources/views/reports/partials/exp-not-grouped.twig
index ec26868ce61..59da401016c 100644
--- a/resources/views/reports/partials/exp-not-grouped.twig
+++ b/resources/views/reports/partials/exp-not-grouped.twig
@@ -1,9 +1,9 @@
-<table class="table table-hover sortable">
+<table class="table table-hover sortable" aria-label="{{ 'expense_report_table'|_ }}">
     <thead>
     <tr>
-        <th style="width:50%;" data-defaultsign="az">{{ 'name'|_ }}</th>
-        <th style="width:25%;" class="hidden-xs" data-defaultsign="_19">{{ 'spent'|_ }}</th>
-        <th style="width:25%;" class="hidden-xs" data-defaultsign="_19">{{ 'earned'|_ }}</th>
+        <th scope="col" style="width:50%;" data-defaultsign="az">{{ 'name'|_ }}</th>
+        <th scope="col" style="width:25%;" class="hidden-xs" data-defaultsign="_19">{{ 'spent'|_ }}</th>
+        <th scope="col" style="width:25%;" class="hidden-xs" data-defaultsign="_19">{{ 'earned'|_ }}</th>
     </tr>
     </thead>
     <tbody>
diff --git a/resources/views/reports/partials/income-expenses.twig b/resources/views/reports/partials/income-expenses.twig
index 0bb7c009612..861e33c8c94 100644
--- a/resources/views/reports/partials/income-expenses.twig
+++ b/resources/views/reports/partials/income-expenses.twig
@@ -1,10 +1,10 @@
-<table class="table table-hover sortable">
+<table class="table table-hover sortable" aria-label="{{ 'income_expenses_table'|_ }}">
     <thead>
     <tr>
-        <th data-defaultsign="az">{{ 'name'|_ }}</th>
-        <th data-defaultsign="_19" style="text-align: right;">{{ 'total'|_ }}</th>
-        <th data-defaultsign="_19" class="hidden-xs" style="text-align: right;">{{ 'average'|_ }}</th>
-        <th data-defaultsort="disabled"></th>
+        <th scope="col" data-defaultsign="az">{{ 'name'|_ }}</th>
+        <th scope="col" data-defaultsign="_19" style="text-align: right;">{{ 'total'|_ }}</th>
+        <th scope="col" data-defaultsign="_19" class="hidden-xs" style="text-align: right;">{{ 'average'|_ }}</th>
+        <th scope="col" data-defaultsort="disabled">{{ 'actions'|_ }}</th>
     </tr>
     </thead>
     <tbody>
diff --git a/resources/views/reports/partials/journals-audit.twig b/resources/views/reports/partials/journals-audit.twig
index 5eb2f71b74b..b6b8e43a1b3 100644
--- a/resources/views/reports/partials/journals-audit.twig
+++ b/resources/views/reports/partials/journals-audit.twig
@@ -1,36 +1,36 @@
-<table class="table table-hover table-compressed table-responsive ">
+<table class="table table-hover table-compressed table-responsive" aria-label="{{ 'transaction_audit_table'|_ }}">
     <thead>
     <tr class="ignore">
-        <th class="hide-buttons">&nbsp;</th>
-        <th class="hide-icon">&nbsp;</th>
+        <th class="hide-buttons" scope="col">&nbsp;</th>
+        <th class="hide-icon" scope="col">&nbsp;</th>
 
-        <th class="hide-description">{{ trans('list.description') }}</th>
-        <th class="hide-balance_before" style="text-align: right;">{{ trans('list.balance_before') }}</th>
-        <th class="hide-amount" style="text-align: right;">{{ trans('list.amount') }}</th>
-        <th class="hide-balance_after" style="text-align: right;">{{ trans('list.balance_after') }}</th>
+        <th class="hide-description" scope="col">{{ trans('list.description') }}</th>
+        <th class="hide-balance_before" scope="col" style="text-align: right;">{{ trans('list.balance_before') }}</th>
+        <th class="hide-amount" scope="col" style="text-align: right;">{{ trans('list.amount') }}</th>
+        <th class="hide-balance_after" scope="col" style="text-align: right;">{{ trans('list.balance_after') }}</th>
 
-        <th class="hide-date">{{ trans('list.date') }}</th>
+        <th class="hide-date" scope="col">{{ trans('list.date') }}</th>
         {# new optional fields (3x) #}
-        <th class="hide-from">{{ trans('list.from') }}</th>
-        <th class="hide-to">{{ trans('list.to') }}</th>
+        <th class="hide-from" scope="col">{{ trans('list.from') }}</th>
+        <th class="hide-to" scope="col">{{ trans('list.to') }}</th>
 
-        <th class="hide-budget"><span class="fa fa-pie-chart fa-fw" title="{{ trans('list.budget') }}"></span></th>
-        <th class="hide-category"><span class="fa fa-bookmark fa-fw" title="{{ trans('list.category') }}"></span></th>
-        <th class="hide-bill">{{ trans('list.bill') }}</th>
+        <th class="hide-budget" scope="col"><span class="fa fa-pie-chart fa-fw" title="{{ trans('list.budget') }}" aria-hidden="true"></span><span class="sr-only">{{ trans('list.budget') }}</span></th>
+        <th class="hide-category" scope="col"><span class="fa fa-bookmark fa-fw" title="{{ trans('list.category') }}" aria-hidden="true"></span><span class="sr-only">{{ trans('list.category') }}</span></th>
+        <th class="hide-bill" scope="col">{{ trans('list.bill') }}</th>
 
         {# more optional fields (2x) #}
-        <th class="hide-create_date">{{ trans('list.create_date') }}</th>
-        <th class="hide-update_date">{{ trans('list.update_date') }}</th>
+        <th class="hide-create_date" scope="col">{{ trans('list.create_date') }}</th>
+        <th class="hide-update_date" scope="col">{{ trans('list.update_date') }}</th>
 
-        <th class="hide-notes">{{ trans('list.notes') }}</th>
+        <th class="hide-notes" scope="col">{{ trans('list.notes') }}</th>
 
         {# even more optional fields #}
-        <th class="hide-interest_date">{{ trans('list.interest_date') }}</th>
-        <th class="hide-book_date">{{ trans('list.book_date') }}</th>
-        <th class="hide-process_date">{{ trans('list.process_date') }}</th>
-        <th class="hide-due_date">{{ trans('list.due_date') }}</th>
-        <th class="hide-payment_date">{{ trans('list.payment_date') }}</th>
-        <th class="hide-invoice_date">{{ trans('list.invoice_date') }}</th>
+        <th class="hide-interest_date" scope="col">{{ trans('list.interest_date') }}</th>
+        <th class="hide-book_date" scope="col">{{ trans('list.book_date') }}</th>
+        <th class="hide-process_date" scope="col">{{ trans('list.process_date') }}</th>
+        <th class="hide-due_date" scope="col">{{ trans('list.due_date') }}</th>
+        <th class="hide-payment_date" scope="col">{{ trans('list.payment_date') }}</th>
+        <th class="hide-invoice_date" scope="col">{{ trans('list.invoice_date') }}</th>
 
     </tr>
     </thead>
diff --git a/resources/views/reports/partials/operations.twig b/resources/views/reports/partials/operations.twig
index 70dc36bb876..6fcb144194d 100644
--- a/resources/views/reports/partials/operations.twig
+++ b/resources/views/reports/partials/operations.twig
@@ -1,10 +1,10 @@
-<table class="table table-hover sortable">
+<table class="table table-hover sortable" aria-label="{{ 'financial_operations_summary'|_ }}">
     <thead>
     <tr>
-        <th data-defaultsign="az">{{'currency'|_}}</th>
-        <th data-defaultsign="_19">{{ 'money_flowing_in'|_ }}</th>
-        <th data-defaultsign="_19">{{ 'money_flowing_out'|_ }}</th>
-        <th data-defaultsign="_19">{{ 'difference'|_ }}</th>
+        <th scope="col" data-defaultsign="az">{{'currency'|_}}</th>
+        <th scope="col" data-defaultsign="_19">{{ 'money_flowing_in'|_ }}</th>
+        <th scope="col" data-defaultsign="_19">{{ 'money_flowing_out'|_ }}</th>
+        <th scope="col" data-defaultsign="_19">{{ 'difference'|_ }}</th>
     </tr>
     </thead>
     <tbody>
diff --git a/resources/views/reports/partials/top-transactions.twig b/resources/views/reports/partials/top-transactions.twig
index 8d0a835be08..c5dd9ebe627 100644
--- a/resources/views/reports/partials/top-transactions.twig
+++ b/resources/views/reports/partials/top-transactions.twig
@@ -1,10 +1,10 @@
-<table class="table table-hover sortable">
+<table class="table table-hover sortable" aria-label="{{ 'top_transactions_table'|_ }}">
     <thead>
     <tr>
-        <th data-defaultsign="az">{{ 'account'|_ }}</th>
-        <th data-defaultsign="az">{{ 'description'|_ }}</th>
-        <th data-defaultsign="month">{{ 'date'|_ }}</th>
-        <th style="width:25%;" class="hidden-xs" data-defaultsign="_19">{{ 'amount'|_ }}</th>
+        <th scope="col" data-defaultsign="az">{{ 'account'|_ }}</th>
+        <th scope="col" data-defaultsign="az">{{ 'description'|_ }}</th>
+        <th scope="col" data-defaultsign="month">{{ 'date'|_ }}</th>
+        <th scope="col" style="width:25%;" class="hidden-xs" data-defaultsign="_19">{{ 'amount'|_ }}</th>
     </tr>
     </thead>
     <tbody>
diff --git a/resources/views/reports/tag/partials/account-per-tag.twig b/resources/views/reports/tag/partials/account-per-tag.twig
index 871cf05d71c..90f2cba403a 100644
--- a/resources/views/reports/tag/partials/account-per-tag.twig
+++ b/resources/views/reports/tag/partials/account-per-tag.twig
@@ -1,9 +1,9 @@
-<table class="table table-hover sortable">
+<table class="table table-hover sortable" aria-label="{{ 'account_per_tag_table'|_ }}">
     <thead>
     <tr>
-        <th data-defaultsign="az">{{ 'name'|_ }}</th>
+        <th data-defaultsign="az" scope="col">{{ 'name'|_ }}</th>
         {% for tag in tags %}
-            <th data-defaultsign="_19" style="text-align: right;">{{ tag.tag }}</th>
+            <th data-defaultsign="_19" style="text-align: right;" scope="col">{{ tag.tag }}</th>
         {% endfor %}
     </tr>
     </thead>
diff --git a/resources/views/reports/tag/partials/accounts.twig b/resources/views/reports/tag/partials/accounts.twig
index 4e9ce9e9a2f..1801fd8cd8a 100644
--- a/resources/views/reports/tag/partials/accounts.twig
+++ b/resources/views/reports/tag/partials/accounts.twig
@@ -1,10 +1,10 @@
-<table class="table table-hover sortable">
+<table class="table table-hover sortable" aria-label="{{ 'accounts_report_table'|_ }}">
     <thead>
     <tr>
-        <th data-defaultsign="az">{{ 'name'|_ }}</th>
-        <th data-defaultsign="_19" style="text-align: right;">{{ 'spent'|_ }}</th>
-        <th data-defaultsign="_19" style="text-align: right;">{{ 'earned'|_ }}</th>
-        <th data-defaultsign="_19" style="text-align: right;">{{ 'sum'|_ }}</th>
+        <th data-defaultsign="az" scope="col">{{ 'name'|_ }}</th>
+        <th data-defaultsign="_19" style="text-align: right;" scope="col">{{ 'spent'|_ }}</th>
+        <th data-defaultsign="_19" style="text-align: right;" scope="col">{{ 'earned'|_ }}</th>
+        <th data-defaultsign="_19" style="text-align: right;" scope="col">{{ 'sum'|_ }}</th>
     </tr>
     </thead>
     <tbody>
diff --git a/resources/views/reports/tag/partials/avg-expenses.twig b/resources/views/reports/tag/partials/avg-expenses.twig
index b34a2ecc636..05ad85c74ac 100644
--- a/resources/views/reports/tag/partials/avg-expenses.twig
+++ b/resources/views/reports/tag/partials/avg-expenses.twig
@@ -1,10 +1,10 @@
-<table class="table table-hover sortable">
+<table class="table table-hover sortable" aria-label="{{ 'average_expenses_by_account'|_ }}">
     <thead>
     <tr>
-        <th data-defaultsign="az">{{ 'account'|_ }}</th>
-        <th data-defaultsign="_19" style="text-align: right;">{{ 'spent_average'|_ }}</th>
-        <th data-defaultsign="_19" style="text-align: right;">{{ 'total'|_ }}</th>
-        <th data-defaultsign="_19">{{ 'transaction_count'|_ }}</th>
+        <th data-defaultsign="az" scope="col">{{ 'account'|_ }}</th>
+        <th data-defaultsign="_19" style="text-align: right;" scope="col">{{ 'spent_average'|_ }}</th>
+        <th data-defaultsign="_19" style="text-align: right;" scope="col">{{ 'total'|_ }}</th>
+        <th data-defaultsign="_19" scope="col">{{ 'transaction_count'|_ }}</th>
     </tr>
     </thead>
     <tbody>
diff --git a/resources/views/reports/tag/partials/avg-income.twig b/resources/views/reports/tag/partials/avg-income.twig
index b859f13a09c..0828406b59d 100644
--- a/resources/views/reports/tag/partials/avg-income.twig
+++ b/resources/views/reports/tag/partials/avg-income.twig
@@ -1,10 +1,10 @@
-<table class="table table-hover sortable">
+<table class="table table-hover sortable" aria-label="{{ 'average_income_by_account'|_ }}">
     <thead>
     <tr>
-        <th data-defaultsign="az">{{ 'account'|_ }}</th>
-        <th data-defaultsign="_19" style="text-align: right;">{{ 'spent_average'|_ }}</th>
-        <th data-defaultsign="_19" style="text-align: right;">{{ 'total'|_ }}</th>
-        <th data-defaultsign="_19">{{ 'transaction_count'|_ }}</th>
+        <th data-defaultsign="az" scope="col">{{ 'account'|_ }}</th>
+        <th data-defaultsign="_19" style="text-align: right;" scope="col">{{ 'spent_average'|_ }}</th>
+        <th data-defaultsign="_19" style="text-align: right;" scope="col">{{ 'total'|_ }}</th>
+        <th data-defaultsign="_19" scope="col">{{ 'transaction_count'|_ }}</th>
     </tr>
     </thead>
     <tbody>
diff --git a/resources/views/reports/tag/partials/tags.twig b/resources/views/reports/tag/partials/tags.twig
index ed535d43eea..6e4a1c34145 100644
--- a/resources/views/reports/tag/partials/tags.twig
+++ b/resources/views/reports/tag/partials/tags.twig
@@ -1,10 +1,10 @@
-<table class="table table-hover sortable">
+<table class="table table-hover sortable" aria-label="{{ 'tag_report_table'|_ }}">
     <thead>
     <tr>
-        <th data-defaultsign="az">{{ 'name'|_ }}</th>
-        <th data-defaultsign="_19" style="text-align: right;">{{ 'spent'|_ }}</th>
-        <th data-defaultsign="_19" style="text-align: right;">{{ 'earned'|_ }}</th>
-        <th data-defaultsign="_19" style="text-align: right;">{{ 'sum'|_ }}</th>
+        <th scope="col" data-defaultsign="az">{{ 'name'|_ }}</th>
+        <th scope="col" data-defaultsign="_19" style="text-align: right;">{{ 'spent'|_ }}</th>
+        <th scope="col" data-defaultsign="_19" style="text-align: right;">{{ 'earned'|_ }}</th>
+        <th scope="col" data-defaultsign="_19" style="text-align: right;">{{ 'sum'|_ }}</th>
     </tr>
     </thead>
     <tbody>
diff --git a/resources/views/reports/tag/partials/top-expenses.twig b/resources/views/reports/tag/partials/top-expenses.twig
index 1e88ec350b4..188bcf7218d 100644
--- a/resources/views/reports/tag/partials/top-expenses.twig
+++ b/resources/views/reports/tag/partials/top-expenses.twig
@@ -1,11 +1,11 @@
-<table class="table table-hover sortable">
+<table class="table table-hover sortable" aria-label="{{ 'top_expenses_table'|_ }}">
     <thead>
     <tr>
-        <th data-defaultsort="disabled">{{ 'description'|_ }}</th>
-        <th data-defaultsign="month">{{ 'date'|_ }}</th>
-        <th data-defaultsign="az">{{ 'account'|_ }}</th>
-        <th data-defaultsign="az">{{ 'tag'|_ }}</th>
-        <th data-defaultsign="_19" style="text-align: right;">{{ 'amount'|_ }}</th>
+        <th scope="col" data-defaultsort="disabled">{{ 'description'|_ }}</th>
+        <th scope="col" data-defaultsign="month">{{ 'date'|_ }}</th>
+        <th scope="col" data-defaultsign="az">{{ 'account'|_ }}</th>
+        <th scope="col" data-defaultsign="az">{{ 'tag'|_ }}</th>
+        <th scope="col" data-defaultsign="_19" style="text-align: right;">{{ 'amount'|_ }}</th>
     </tr>
     </thead>
     <tbody>
diff --git a/resources/views/reports/tag/partials/top-income.twig b/resources/views/reports/tag/partials/top-income.twig
index 12dc972911d..1419292fc08 100644
--- a/resources/views/reports/tag/partials/top-income.twig
+++ b/resources/views/reports/tag/partials/top-income.twig
@@ -1,11 +1,11 @@
-<table class="table table-hover sortable">
+<table class="table table-hover sortable" aria-label="{{ 'top_income_transactions'|_ }}">
     <thead>
     <tr>
-        <th data-defaultsort="disabled">{{ 'description'|_ }}</th>
-        <th data-defaultsign="month">{{ 'date'|_ }}</th>
-        <th data-defaultsign="az">{{ 'account'|_ }}</th>
-        <th data-defaultsign="az">{{ 'tag'|_ }}</th>
-        <th data-defaultsign="_19" style="text-align: right;">{{ 'amount'|_ }}</th>
+        <th scope="col" data-defaultsort="disabled">{{ 'description'|_ }}</th>
+        <th scope="col" data-defaultsign="month">{{ 'date'|_ }}</th>
+        <th scope="col" data-defaultsign="az">{{ 'account'|_ }}</th>
+        <th scope="col" data-defaultsign="az">{{ 'tag'|_ }}</th>
+        <th scope="col" data-defaultsign="_19" style="text-align: right;">{{ 'amount'|_ }}</th>
     </tr>
     </thead>
     <tbody>
diff --git a/resources/views/rules/index.twig b/resources/views/rules/index.twig
index 62adc40fd3e..35b6e35147c 100644
--- a/resources/views/rules/index.twig
+++ b/resources/views/rules/index.twig
@@ -71,15 +71,15 @@
                         </p>
 
                         {% if ruleGroup.rules.count() > 0 %}
-                            <table class="table table-hover table-striped group-rules">
+                            <table class="table table-hover table-striped group-rules" aria-label="{{ 'rules_in_group'|_ }} {{ ruleGroup.title }}">
                                 <thead>
                                 <tr>
-                                    <th style="width:5%;">&nbsp;</th>
-                                    <th style="width:10%;">&nbsp;</th>
-                                    <th style="width:10%;">&nbsp;</th>
-                                    <th style="width:25%;">{{ 'rule_name'|_ }}</th>
-                                    <th style="width:25%;" class="hidden-xs">{{ 'rule_triggers'|_ }}</th>
-                                    <th style="width:25%;" class="hidden-xs">{{ 'rule_actions'|_ }}</th>
+                                    <th scope="col" style="width:5%;">{{ 'drag_handle'|_ }}</th>
+                                    <th scope="col" style="width:10%;">{{ 'actions'|_ }}</th>
+                                    <th scope="col" style="width:10%;">{{ 'test_duplicate'|_ }}</th>
+                                    <th scope="col" style="width:25%;">{{ 'rule_name'|_ }}</th>
+                                    <th scope="col" style="width:25%;" class="hidden-xs">{{ 'rule_triggers'|_ }}</th>
+                                    <th scope="col" style="width:25%;" class="hidden-xs">{{ 'rule_actions'|_ }}</th>
                                 </tr>
                                 </thead>
                                 <tbody class="rule-connected-list">
diff --git a/resources/views/rules/partials/test-trigger-modal.twig b/resources/views/rules/partials/test-trigger-modal.twig
index 11b03b288ad..739e953b46d 100644
--- a/resources/views/rules/partials/test-trigger-modal.twig
+++ b/resources/views/rules/partials/test-trigger-modal.twig
@@ -1,13 +1,13 @@
-<div class="modal fade" id="testTriggerModal" tabindex="-1" role="dialog" aria-labelledby="testTriggerLabel">
+<div class="modal fade" id="testTriggerModal" tabindex="-1" role="dialog" aria-labelledby="testTriggerLabel" aria-hidden="true">
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span>&times;</span></button>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
                 <h4 class="modal-title" id="testTriggerLabel">{{ 'test_rule_triggers'|_ }}</h4>
             </div>
             <div class="modal-body">
                 <div class="transaction-warning alert alert-warning">
-                    <h4><span class="icon fa fa-warning"></span> {{ 'flash_warning'|_ }}</h4>
+                    <h5><span class="icon fa fa-warning"></span> {{ 'flash_warning'|_ }}</h5>
                     <span class="warning-contents"></span>
                 </div>
                 <div class="transactions-list">
diff --git a/resources/views/rules/rule-group/create.twig b/resources/views/rules/rule-group/create.twig
index dd4d212683f..fc130493bb8 100644
--- a/resources/views/rules/rule-group/create.twig
+++ b/resources/views/rules/rule-group/create.twig
@@ -5,13 +5,14 @@
 {% endblock %}
 
 {% block content %}
+    <h1 class="sr-only">{{ 'create_new_rule_group'|_ }}</h1>
     <form method="POST" action="{{ route('rule-groups.store') }}" accept-charset="UTF-8" class="form-horizontal" id="store">
         <input name="_token" type="hidden" value="{{ csrf_token() }}">
         <div class="row">
             <div class="col-lg-6 col-md-6 col-sm-12">
                 <div class="box box-primary">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
+                        <h2 class="box-title">{{ 'mandatoryFields'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         {{ ExpandedForm.text('title') }}
@@ -23,7 +24,7 @@
                 {# optional fields #}
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'optionalFields'|_ }}</h3>
+                        <h2 class="box-title">{{ 'optionalFields'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         {{ ExpandedForm.textarea('description') }}
@@ -36,7 +37,7 @@
                 {# panel for options #}
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'options'|_ }}</h3>
+                        <h2 class="box-title">{{ 'options'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         {{ ExpandedForm.optionsList('create','rule-group') }}
diff --git a/resources/views/rules/rule-group/delete.twig b/resources/views/rules/rule-group/delete.twig
index 6d68075cce1..a6ac14191b2 100644
--- a/resources/views/rules/rule-group/delete.twig
+++ b/resources/views/rules/rule-group/delete.twig
@@ -12,7 +12,7 @@
             <div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12">
                 <div class="box box-danger">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ trans('form.delete_rule_group', {'title': ruleGroup.title}) }}</h3>
+                        <h1 class="box-title">{{ trans('form.delete_rule_group', {'title': ruleGroup.title}) }}</h1>
                     </div>
                     <div class="box-body">
                         <p class="text-danger">
diff --git a/resources/views/rules/rule-group/edit.twig b/resources/views/rules/rule-group/edit.twig
index 4f42533ba03..90ed0d99363 100644
--- a/resources/views/rules/rule-group/edit.twig
+++ b/resources/views/rules/rule-group/edit.twig
@@ -15,7 +15,7 @@
             <div class="col-lg-6 col-md-12 col-sm-6">
                 <div class="box box-primary">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
+                        <h2 class="box-title">{{ 'mandatoryFields'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         {# only correct way to do active checkbox #}
@@ -31,7 +31,7 @@
                 {# optional fields #}
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'optionalFields'|_ }}</h3>
+                        <h2 class="box-title">{{ 'optionalFields'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         {{ ExpandedForm.textarea('description', ruleGroup.description) }}
@@ -44,7 +44,7 @@
                 {# panel for options #}
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'options'|_ }}</h3>
+                        <h2 class="box-title">{{ 'options'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         {{ ExpandedForm.optionsList('update','rule-group') }}
diff --git a/resources/views/rules/rule-group/select-transactions.twig b/resources/views/rules/rule-group/select-transactions.twig
index 842458804f7..916b8ab4131 100644
--- a/resources/views/rules/rule-group/select-transactions.twig
+++ b/resources/views/rules/rule-group/select-transactions.twig
@@ -6,6 +6,8 @@
 
 {% block content %}
 
+    <h1>{{ 'execute_rule_group'|_ }}</h1>
+
     <form method="POST" action="{{ route('rule-groups.execute', ruleGroup.id) }}" accept-charset="UTF-8"
           class="form-horizontal" id="execute-rule-group">
         <input name="_token" type="hidden" value="{{ csrf_token() }}">
@@ -15,7 +17,7 @@
 
                 <div class="box box-primary">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ subTitle }}</h3>
+                        <h2 class="box-title">{{ subTitle }}</h2>
                     </div>
                     <div class="box-body">
                         <div id="form-body">
diff --git a/resources/views/rules/rule/create.twig b/resources/views/rules/rule/create.twig
index e8a134ee7c9..e9668dcc801 100644
--- a/resources/views/rules/rule/create.twig
+++ b/resources/views/rules/rule/create.twig
@@ -18,7 +18,7 @@
                 <div class="col-lg-12 col-md-12 col-sm-12">
                     <div class="box box-success" id="mandatory">
                         <div class="box-header with-border">
-                            <h3 class="box-title">{{ trans('firefly.create_rule_for_bill', {name: bill.name}) }}</h3>
+                            <h1 class="box-title">{{ trans('firefly.create_rule_for_bill', {name: bill.name}) }}</h1>
                         </div>
                         <div class="box-body">
                             <p class="text-info">
@@ -33,7 +33,7 @@
             <div class="col-lg-6 col-md-6 col-sm-12">
                 <div class="box box-primary" id="mandatory">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
+                        <h2 class="box-title">{{ 'mandatoryFields'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         {{ ExpandedForm.text('title') }}
@@ -49,7 +49,7 @@
                 {# optional fields #}
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'optionalFields'|_ }}</h3>
+                        <h2 class="box-title">{{ 'optionalFields'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         {{ ExpandedForm.textarea('description', null, {helpText: trans('firefly.field_supports_markdown')}) }}
@@ -62,16 +62,16 @@
             <div class="col-lg-12 col-md-12 col-sm-12">
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'rule_triggers'|_ }}</h3>
+                        <h2 class="box-title">{{ 'rule_triggers'|_ }}</h2>
                     </div>
                     <div class="box-body rule-trigger-box">
-                        <table class="table table-condensed table-bordered table-striped">
+                        <table class="table table-condensed table-bordered table-striped" aria-label="{{ 'rule_triggers'|_ }}">
                             <thead>
                             <tr>
-                                <th colspan="2">{{ 'trigger'|_ }}</th>
-                                <th>{{ 'is_not_rule_trigger'|_ }}</th>
-                                <th>{{ 'trigger_value'|_ }}</th>
-                                <th>{{ 'stop_processing_other_triggers'|_ }}</th>
+                                <th colspan="2" scope="col">{{ 'trigger'|_ }}</th>
+                                <th scope="col">{{ 'is_not_rule_trigger'|_ }}</th>
+                                <th scope="col">{{ 'trigger_value'|_ }}</th>
+                                <th scope="col">{{ 'stop_processing_other_triggers'|_ }}</th>
                             </tr>
                             </thead>
                             <tbody class="rule-trigger-tbody">
@@ -97,15 +97,15 @@
             <div class="col-lg-12 col-md-12 col-sm-12">
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'rule_actions'|_ }}</h3>
+                        <h2 class="box-title">{{ 'rule_actions'|_ }}</h2>
                     </div>
                     <div class="box-body rule-action-box">
-                        <table class="table table-condensed table-bordered table-striped">
+                        <table class="table table-condensed table-bordered table-striped" aria-label="{{ 'rule_actions'|_ }}">
                             <thead>
                             <tr>
-                                <th colspan="2">{{ 'action'|_ }}</th>
-                                <th>{{ 'action_value'|_ }}</th>
-                                <th>{{ 'stop_executing_other_actions'|_ }}</th>
+                                <th colspan="2" scope="col">{{ 'action'|_ }}</th>
+                                <th scope="col">{{ 'action_value'|_ }}</th>
+                                <th scope="col">{{ 'stop_executing_other_actions'|_ }}</th>
                             </tr>
                             </thead>
                             <tbody class="rule-action-tbody">
@@ -129,7 +129,7 @@
                 {# panel for options #}
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'options'|_ }}</h3>
+                        <h2 class="box-title">{{ 'options'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         {{ ExpandedForm.optionsList('create','rule') }}
diff --git a/resources/views/rules/rule/delete.twig b/resources/views/rules/rule/delete.twig
index ac328bbf9ed..f87661f039b 100644
--- a/resources/views/rules/rule/delete.twig
+++ b/resources/views/rules/rule/delete.twig
@@ -12,7 +12,7 @@
             <div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12">
                 <div class="box box-danger">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ trans('form.delete_rule', {'title': rule.title}) }}</h3>
+                        <h1 class="box-title">{{ trans('form.delete_rule', {'title': rule.title}) }}</h1>
                     </div>
                     <div class="box-body">
                         <p class="text-danger">
diff --git a/resources/views/rules/rule/edit.twig b/resources/views/rules/rule/edit.twig
index 7d1805cb3e4..5e70a0dee06 100644
--- a/resources/views/rules/rule/edit.twig
+++ b/resources/views/rules/rule/edit.twig
@@ -6,6 +6,8 @@
 
 {% block content %}
 
+    <h1 class="sr-only">{{ 'edit_rule'|_ }}: {{ rule.title }}</h1>
+
     <form method="post" action="{{ route('rules.update', rule.id) }}" class="form-horizontal" accept-charset="UTF-8"
           enctype="multipart/form-data">
         <input type="hidden" name="_token" value="{{ csrf_token() }}"/>
@@ -14,7 +16,7 @@
             <div class="col-lg-6 col-md-6 col-sm-12">
                 <div class="box box-primary">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
+                        <h2 class="box-title">{{ 'mandatoryFields'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         {{ ExpandedForm.text('title', rule.title) }}
@@ -34,7 +36,7 @@
                 {# optional fields #}
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'optionalFields'|_ }}</h3>
+                        <h2 class="box-title">{{ 'optionalFields'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         {{ ExpandedForm.textarea('description', rule.description, {helpText: trans('firefly.field_supports_markdown')}) }}
@@ -47,16 +49,16 @@
             <div class="col-lg-12 col-md-12 col-sm-12">
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'rule_triggers'|_ }}</h3>
+                        <h2 class="box-title">{{ 'rule_triggers'|_ }}</h2>
                     </div>
                     <div class="box-body rule-trigger-box">
-                        <table class="table table-condensed table-bordered table-striped">
+                        <table class="table table-condensed table-bordered table-striped" aria-label="{{ 'rule_triggers'|_ }}">
                             <thead>
                             <tr>
-                                <th colspan="2">{{ 'trigger'|_ }}</th>
-                                <th>{{ 'is_not_rule_trigger'|_ }}</th>
-                                <th>{{ 'trigger_value'|_ }}</th>
-                                <th>{{ 'stop_processing_other_triggers'|_ }}</th>
+                                <th scope="col" colspan="2">{{ 'trigger'|_ }}</th>
+                                <th scope="col">{{ 'is_not_rule_trigger'|_ }}</th>
+                                <th scope="col">{{ 'trigger_value'|_ }}</th>
+                                <th scope="col">{{ 'stop_processing_other_triggers'|_ }}</th>
                             </tr>
                             </thead>
                             <tbody class="rule-trigger-tbody">
@@ -83,15 +85,15 @@
             <div class="col-lg-12 col-md-12 col-sm-12">
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'rule_actions'|_ }}</h3>
+                        <h2 class="box-title">{{ 'rule_actions'|_ }}</h2>
                     </div>
                     <div class="box-body">
-                        <table class="table table-condensed table-bordered table-striped">
+                        <table class="table table-condensed table-bordered table-striped" aria-label="{{ 'rule_actions'|_ }}">
                             <thead>
                             <tr>
-                                <th colspan="2">{{ 'action'|_ }}</th>
-                                <th>{{ 'action_value'|_ }}</th>
-                                <th>{{ 'stop_executing_other_actions'|_ }}</th>
+                                <th scope="col" colspan="2">{{ 'action'|_ }}</th>
+                                <th scope="col">{{ 'action_value'|_ }}</th>
+                                <th scope="col">{{ 'stop_executing_other_actions'|_ }}</th>
                             </tr>
                             </thead>
                             <tbody class="rule-action-tbody">
@@ -115,7 +117,7 @@
                 {# panel for options #}
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'options'|_ }}</h3>
+                        <h2 class="box-title">{{ 'options'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         {{ ExpandedForm.optionsList('update','rule') }}
diff --git a/resources/views/search/index.twig b/resources/views/search/index.twig
index 92bb453811f..4a5e98f01d7 100644
--- a/resources/views/search/index.twig
+++ b/resources/views/search/index.twig
@@ -9,7 +9,7 @@
         <div class="col-lg-12">
             <div class="box box-primary">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'search_box'|_ }}</h3>
+                    <h1 class="box-title">{{ 'search_box'|_ }}</h1>
                 </div>
                 <div class="box-body">
                     <p>
@@ -88,7 +88,7 @@
             <div class="col-lg-12 col-md-12 col-sm-12">
                 <div class="box search_box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'transactions'|_ }}</h3>
+                        <h2 class="box-title">{{ 'transactions'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         <p class="search_ongoing text-center" style="margin-top:70px;">
@@ -127,7 +127,7 @@
             <div class="col-lg-12 col-md-12 col-sm-12">
                 <div class="box box-danger">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'search_error'|_ }}</h3>
+                        <h2 class="box-title">{{ 'search_error'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         <p class="search_ongoing">
@@ -143,7 +143,7 @@
             <div class="col-lg-12 col-md-12 col-sm-12">
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'search_results'|_ }}</h3>
+                        <h2 class="box-title">{{ 'search_results'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         <p>{{ 'no_results_for_empty_search'|_ }}</p>
diff --git a/resources/views/settings/link/delete.twig b/resources/views/settings/link/delete.twig
index dee7289166d..54dcf98e416 100644
--- a/resources/views/settings/link/delete.twig
+++ b/resources/views/settings/link/delete.twig
@@ -13,7 +13,7 @@
             <div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12">
                 <div class="box box-danger">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ trans('form.delete_link_type', {'name': linkType.name}) }}</h3>
+                        <h1 class="box-title">{{ trans('form.delete_link_type', {'name': linkType.name}) }}</h1>
                     </div>
                     <div class="box-body">
                         <p class="text-danger">
diff --git a/resources/views/settings/link/index.twig b/resources/views/settings/link/index.twig
index 8c85b09c19b..694aefe2816 100644
--- a/resources/views/settings/link/index.twig
+++ b/resources/views/settings/link/index.twig
@@ -6,19 +6,20 @@
 {% block content %}
     <div class="row">
         <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
+            <h1 class="sr-only">{{ 'journal_link_configuration'|_ }}</h1>
             <div class="box box-default">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'journal_link_configuration'|_ }}</h3>
+                    <h2 class="box-title">{{ 'journal_link_configuration'|_ }}</h2>
                 </div>
                 <div class="box-body no-padding">
-                    <table class="table table-hover sortable">
+                    <table class="table table-hover sortable" aria-label="{{ 'journal_link_configuration'|_ }}">
                         <thead>
                         <tr>
-                            <th class="hidden-sm hidden-xs" data-defaultsort="disabled">&nbsp;</th>
-                            <th data-defaultsign="az">{{ trans('list.name') }}</th>
-                            <th class="hidden-sm hidden-xs" data-defaultsign="az">{{ trans('list.inward') }}</th>
-                            <th class="hidden-sm hidden-xs" data-defaultsign="az">{{ trans('list.outward') }}</th>
-                            <th data-defaultsign="_19">{{ trans('list.number_of_transactions') }}</th>
+                            <th class="hidden-sm hidden-xs" data-defaultsort="disabled" scope="col">&nbsp;</th>
+                            <th data-defaultsign="az" scope="col">{{ trans('list.name') }}</th>
+                            <th class="hidden-sm hidden-xs" data-defaultsign="az" scope="col">{{ trans('list.inward') }}</th>
+                            <th class="hidden-sm hidden-xs" data-defaultsign="az" scope="col">{{ trans('list.outward') }}</th>
+                            <th data-defaultsign="_19" scope="col">{{ trans('list.number_of_transactions') }}</th>
                         </tr>
                         </thead>
                         <tbody>
diff --git a/resources/views/settings/link/show.twig b/resources/views/settings/link/show.twig
index c45689b6566..41e7b2cbc53 100644
--- a/resources/views/settings/link/show.twig
+++ b/resources/views/settings/link/show.twig
@@ -8,18 +8,18 @@
         <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
             <div class="box box-default">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ trans('firefly.overview_for_link', {name: journalLinkTranslation('name', linkType.name)}) }}</h3>
+                    <h1 class="box-title">{{ trans('firefly.overview_for_link', {name: journalLinkTranslation('name', linkType.name)}) }}</h1>
                 </div>
                 <div class="box-body no-padding">
-                    <table class="table table-hover sortable">
+                    <table class="table table-hover sortable" aria-label="{{ trans('firefly.overview_for_link', {name: journalLinkTranslation('name', linkType.name)}) }}">
                         <thead>
                         <tr>
-                            <th>&nbsp;</th>
-                            <th>{{ trans('firefly.inward_transaction') }}</th>
-                            <th>&nbsp;</th>
-                            <th>{{ trans('firefly.link_description') }}</th>
-                            <th>{{ trans('firefly.outward_transaction') }}</th>
-                            <th>&nbsp;</th>
+                            <th scope="col">{{ trans('firefly.actions') }}</th>
+                            <th scope="col">{{ trans('firefly.inward_transaction') }}</th>
+                            <th scope="col">{{ trans('firefly.amount') }}</th>
+                            <th scope="col">{{ trans('firefly.link_description') }}</th>
+                            <th scope="col">{{ trans('firefly.outward_transaction') }}</th>
+                            <th scope="col">{{ trans('firefly.amount') }}</th>
                         </tr>
                         </thead>
                         <tbody>
diff --git a/resources/views/settings/notifications/index.twig b/resources/views/settings/notifications/index.twig
index e8a60b6b435..db36b5f9e39 100644
--- a/resources/views/settings/notifications/index.twig
+++ b/resources/views/settings/notifications/index.twig
@@ -4,13 +4,18 @@
     {{ Breadcrumbs.render }}
 {% endblock %}
 {% block content %}
+    <div class="row">
+        <div class="col-xs-12">
+            <h1>{{ 'notification_settings'|_ }}</h1>
+        </div>
+    </div>
     <div class="row">
         <div class="col-lg-6 col-md-12 col-sm-12 col-xs-12">
             <form action="{{ route('settings.notification.post') }}" method="post">
                 <input type="hidden" name="_token" value="{{ csrf_token() }}">
                 <div class="box box-default">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'notification_settings'|_ }}</h3>
+                        <h2 class="box-title">{{ 'notification_preferences'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         <p>
@@ -48,7 +53,7 @@
                 <input type="hidden" name="_token" value="{{ csrf_token() }}">
                 <div class="box box-default">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'available_channels_title'|_ }}</h3>
+                        <h2 class="box-title">{{ 'available_channels_title'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         <p>
diff --git a/resources/views/settings/users/delete.twig b/resources/views/settings/users/delete.twig
index 8c0f2ee57db..b7c7ed66dc0 100644
--- a/resources/views/settings/users/delete.twig
+++ b/resources/views/settings/users/delete.twig
@@ -13,7 +13,7 @@
             <div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12">
                 <div class="box box-danger">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ trans('form.delete_user', {'email': user.email}) }}</h3>
+                        <h1 class="box-title">{{ trans('form.delete_user', {'email': user.email}) }}</h1>
                     </div>
                     <div class="box-body">
                         <p class="text-danger">
diff --git a/resources/views/settings/users/edit.twig b/resources/views/settings/users/edit.twig
index 260fee22627..75ae41b900e 100644
--- a/resources/views/settings/users/edit.twig
+++ b/resources/views/settings/users/edit.twig
@@ -4,6 +4,7 @@
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, user) }}
 {% endblock %}
 {% block content %}
+    <h1>{{ 'edit_user'|_ }}</h1>
 
     <form method="post" action="{{ route('settings.users.update',user.id) }}" class="form-horizontal"
           accept-charset="UTF-8"
@@ -16,7 +17,7 @@
             <div class="col-lg-6 col-md-6 col-sm-12">
                 <div class="box box-primary">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
+                        <h2 class="box-title">{{ 'mandatoryFields'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         {% if canEditDetails %}
@@ -42,7 +43,7 @@
                 {# panel for options #}
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'options'|_ }}</h3>
+                        <h2 class="box-title">{{ 'options'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         {{ ExpandedForm.optionsList('update','account') }}
diff --git a/resources/views/settings/users/index.twig b/resources/views/settings/users/index.twig
index 52a0d07fc74..e4d534e4e43 100644
--- a/resources/views/settings/users/index.twig
+++ b/resources/views/settings/users/index.twig
@@ -4,6 +4,11 @@
     {{ Breadcrumbs.render }}
 {% endblock %}
 {% block content %}
+    <div class="row">
+        <div class="col-lg-12">
+            <h1>{{ 'user_management'|_ }}</h1>
+        </div>
+    </div>
     {% if allowInvites %}
         <div class="row">
             <div class="col-lg-6">
@@ -11,7 +16,7 @@
                     <input type="hidden" name="_token" value="{{ csrf_token() }}"/>
                     <div class="box box-primary">
                         <div class="box-header with-border">
-                            <h3 class="box-title">{{ 'invite_new_user_title'|_ }}</h3>
+                            <h2 class="box-title">{{ 'invite_new_user_title'|_ }}</h2>
                         </div>
                         <div class="box-body">
                             <p>
@@ -33,20 +38,20 @@
         <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
             <div class="box box-primary">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'all_users'|_ }}</h3>
+                    <h2 class="box-title">{{ 'all_users'|_ }}</h2>
                 </div>
                 <div class="box-body no-padding">
-                    <table class="table table-responsive table-condensed sortable" aria-label="Table">
+                    <table class="table table-responsive table-condensed sortable" aria-label="{{ 'all_users'|_ }}">
                         <thead>
                         <tr>
-                            <th data-defaultsign="_19" class="hidden-xs" colspan="2">&nbsp;</th>
-                            <th data-defaultsign="az">{{ trans('list.email') }}</th>
-                            <th data-defaultsign="month" class="hidden-xs">{{ trans('list.registered_at') }}</th>
-                            <th data-defaultsign="month" class="hidden-xs">{{ trans('list.updated_at') }}</th>
-                            <th class="hidden-xs">{{ trans('list.is_admin') }}</th>
-                            <th class="hidden-xs">{{ trans('list.has_two_factor') }}</th>
-                            <th>{{ trans('list.is_blocked') }}</th>
-                            <th data-defaultsign="az" class="hidden-xs">{{ trans('list.blocked_code') }}</th>
+                            <th data-defaultsign="_19" class="hidden-xs" colspan="2" scope="col">&nbsp;</th>
+                            <th data-defaultsign="az" scope="col">{{ trans('list.email') }}</th>
+                            <th data-defaultsign="month" class="hidden-xs" scope="col">{{ trans('list.registered_at') }}</th>
+                            <th data-defaultsign="month" class="hidden-xs" scope="col">{{ trans('list.updated_at') }}</th>
+                            <th class="hidden-xs" scope="col">{{ trans('list.is_admin') }}</th>
+                            <th class="hidden-xs" scope="col">{{ trans('list.has_two_factor') }}</th>
+                            <th scope="col">{{ trans('list.is_blocked') }}</th>
+                            <th data-defaultsign="az" class="hidden-xs" scope="col">{{ trans('list.blocked_code') }}</th>
                         </tr>
                         </thead>
                         <tbody>
@@ -118,18 +123,18 @@
             <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'all_invited_users'|_ }}</h3>
+                        <h2 class="box-title">{{ 'all_invited_users'|_ }}</h2>
                     </div>
                     <div class="box-body no-padding">
-                        <table class="table table-responsive table-condensed sortable">
+                        <table class="table table-responsive table-condensed sortable" aria-label="{{ 'all_invited_users'|_ }}">
                             <thead>
                             <tr>
-                                <th data-defaultsign="_19" class="hidden-xs" colspan="1">&nbsp;</th>
-                                <th data-defaultsign="az">{{ trans('list.email') }}</th>
-                                <th data-defaultsign="month" class="hidden-xs">{{ trans('list.invited_at') }}</th>
-                                <th data-defaultsign="month" class="hidden-xs">{{ trans('list.expires') }}</th>
-                                <th class="hidden-xs">{{ trans('list.invited_by') }}</th>
-                                <th>{{ trans('list.invite_link') }}</th>
+                                <th data-defaultsign="_19" class="hidden-xs" colspan="1" scope="col">&nbsp;</th>
+                                <th data-defaultsign="az" scope="col">{{ trans('list.email') }}</th>
+                                <th data-defaultsign="month" class="hidden-xs" scope="col">{{ trans('list.invited_at') }}</th>
+                                <th data-defaultsign="month" class="hidden-xs" scope="col">{{ trans('list.expires') }}</th>
+                                <th class="hidden-xs" scope="col">{{ trans('list.invited_by') }}</th>
+                                <th scope="col">{{ trans('list.invite_link') }}</th>
                             </tr>
                             </thead>
                             <tbody>
diff --git a/resources/views/settings/users/show.twig b/resources/views/settings/users/show.twig
index 04aef4cd7eb..b21d89db992 100644
--- a/resources/views/settings/users/show.twig
+++ b/resources/views/settings/users/show.twig
@@ -4,17 +4,18 @@
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, user) }}
 {% endblock %}
 {% block content %}
+    <h1 class="sr-only">{{ 'user_details'|_ }}</h1>
     <div class="row">
         <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
             <div class="box box-primary">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'user_information'|_ }}</h3>
+                    <h2 class="box-title">{{ 'user_information'|_ }}</h2>
                 </div>
                 <div class="box-body">
-                    <table class="table table-striped table-bordered table-responsive">
+                    <table class="table table-striped table-bordered table-responsive" aria-label="{{ 'user_information'|_ }}">
                         <tbody>
                         <tr>
-                            <td>{{ trans('list.id') }}</td>
+                            <th scope="row">{{ trans('list.id') }}</th>
                             <td>#{{ user.id }}</td>
                         </tr>
                         <tr>
@@ -73,7 +74,7 @@
         <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
             <div class="box box-primary">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'user_data_information'|_ }}</h3>
+                    <h2 class="box-title">{{ 'user_data_information'|_ }}</h2>
                 </div>
                 <div class="box-body">
                     <table class="table table-striped table-bordered table-responsive">
diff --git a/resources/views/tags/create.twig b/resources/views/tags/create.twig
index c334cb93d2f..33224dc1b91 100644
--- a/resources/views/tags/create.twig
+++ b/resources/views/tags/create.twig
@@ -5,6 +5,7 @@
 {% endblock %}
 
 {% block content %}
+    <h1 class="sr-only">{{ 'create_new_tag'|_ }}</h1>
     <!-- set location data high up -->
     <script type="text/javascript" nonce="{{ JS_NONCE }}">
         var locations = {{ locations|json_encode|raw }};
@@ -17,7 +18,7 @@
             <div class="col-lg-5 col-md-5 col-sm-12">
                 <div class="box box-primary">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
+                        <h2 class="box-title">{{ 'mandatoryFields'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         {{ ExpandedForm.text('tag') }}
@@ -29,7 +30,7 @@
 
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'optionalFields'|_ }}</h3>
+                        <h2 class="box-title">{{ 'optionalFields'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         {{ ExpandedForm.date('date') }}
@@ -44,7 +45,7 @@
                 {# panel for options #}
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'options'|_ }}</h3>
+                        <h2 class="box-title">{{ 'options'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         {{ ExpandedForm.optionsList('create','tag') }}
diff --git a/resources/views/tags/delete.twig b/resources/views/tags/delete.twig
index 75ea8f9662e..57c2c7248b5 100644
--- a/resources/views/tags/delete.twig
+++ b/resources/views/tags/delete.twig
@@ -12,7 +12,7 @@
             <div class="col-lg-6 col-lg-offset-3 col-md-6 col-sm-12">
                 <div class="box box-danger">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ trans('firefly.delete_tag',{tag: tag.tag}) }}</h3>
+                        <h1 class="box-title">{{ trans('firefly.delete_tag',{tag: tag.tag}) }}</h1>
                     </div>
                     <div class="box-body">
                         <p class="text-danger">
diff --git a/resources/views/tags/edit.twig b/resources/views/tags/edit.twig
index c07494a04df..5b2234f058c 100644
--- a/resources/views/tags/edit.twig
+++ b/resources/views/tags/edit.twig
@@ -11,6 +11,7 @@
         var mapboxToken = "{{ config('firefly.mapbox_api_key') }}";
     </script>
 
+    <h1 class="sr-only">{{ 'edit_tag'|_ }}: {{ tag.tag }}</h1>
 
     <form method="post" action="{{ route('tags.update',tag.id) }}" class="form-horizontal" accept-charset="UTF-8"
           enctype="multipart/form-data">
@@ -21,7 +22,7 @@
             <div class="col-lg-5 col-md-5 col-sm-12">
                 <div class="box box-primary">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
+                        <h2 class="box-title">{{ 'mandatoryFields'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         {{ ExpandedForm.text('tag', tag.tag) }}
@@ -33,7 +34,7 @@
 
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'optionalFields'|_ }}</h3>
+                        <h2 class="box-title">{{ 'optionalFields'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         {{ ExpandedForm.date('date', tag.date.format('Y-m-d')) }}
@@ -48,7 +49,7 @@
                 {# panel for options #}
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'options'|_ }}</h3>
+                        <h2 class="box-title">{{ 'options'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         {{ ExpandedForm.optionsList('update','tag') }}
diff --git a/resources/views/tags/index.twig b/resources/views/tags/index.twig
index de15b4db182..8462118a27b 100644
--- a/resources/views/tags/index.twig
+++ b/resources/views/tags/index.twig
@@ -5,6 +5,11 @@
 {% endblock %}
 
 {% block content %}
+    <div class="row">
+        <div class="col-lg-12">
+            <h1>{{ 'tags'|_ }}</h1>
+        </div>
+    </div>
     {% if count == 0 %}
         {% include 'partials.empty' with {objectType: 'default', type: 'tags',route: route('tags.create')} %}
     {% else %}
@@ -23,9 +28,9 @@
                         <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
                             <div class="box">
                                 <div class="box-header with-border">
-                                    <h3 class="box-title">
+                                    <h2 class="box-title">
                                         {% if period == 'no-date' %}{{ 'without_date'|_ }}{% else %}{{ period }}{% endif %}
-                                    </h3>
+                                    </h2>
                                 </div>
                                 <div class="box-body">
                                     <div class="row">
diff --git a/resources/views/tags/show.twig b/resources/views/tags/show.twig
index 885c5f6716a..4542ede5519 100644
--- a/resources/views/tags/show.twig
+++ b/resources/views/tags/show.twig
@@ -9,7 +9,7 @@
         <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'meta_data'|_ }}</h3>
+                    <h2 class="box-title">{{ 'meta_data'|_ }}</h2>
 
 
                     <div class="box-tools pull-right">
@@ -28,7 +28,7 @@
                     </div>
                 </div>
                 <div class="box-body no-padding">
-                    <table class="table table-bordered">
+                    <table class="table table-bordered" aria-label="{{ 'tag_metadata_table'|_ }}">
                         {% if tag.description %}
                             <tr>
                                 <td>
@@ -177,7 +177,7 @@
         <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'location'|_ }}</h3>
+                    <h2 class="box-title">{{ 'location'|_ }}</h2>
                     <div class="box-tools pull-right">
                         <div class="btn-group">
                             <button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><span
@@ -208,9 +208,9 @@
             <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">
+                        <h2 class="box-title">
                             {{ 'attachments'|_ }}
-                        </h3>
+                        </h2>
                     </div>
                     <div class="box-body no-padding">
                         {% include 'list.attachments' %}
@@ -232,7 +232,7 @@
         <div class="{% if periods|length > 0 %}col-lg-10 col-md-10 col-sm-12 col-xs-12{% else %}col-lg-12 col-md-12 col-sm-12 col-xs-12{% endif %}">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'transactions'|_ }}</h3>
+                    <h2 class="box-title">{{ 'transactions'|_ }}</h2>
 
 
                     <div class="box-tools pull-right">
diff --git a/resources/views/transactions/bulk/edit.twig b/resources/views/transactions/bulk/edit.twig
index fdcc89863b9..272997af72a 100644
--- a/resources/views/transactions/bulk/edit.twig
+++ b/resources/views/transactions/bulk/edit.twig
@@ -22,16 +22,16 @@
 
                         <div class="row">
                             <div class="col-lg-8 col-md-12 col-sm-12 col-xs-12">
-                                <table class="table table-striped table-condensed">
+                                <table class="table table-striped table-condensed" aria-label="{{ 'bulk_edit_transactions_table'|_ }}">
                                     <thead>
                                     <tr>
-                                        <th>{{ trans('list.description') }}</th>
-                                        <th>{{ trans('list.amount') }}</th>
-                                        <th>{{ trans('list.date') }}</th>
-                                        <th>{{ trans('list.category') }}</th>
-                                        <th>{{ trans('list.budget') }}</th>
-                                        <th>{{ trans('list.tags') }}</th>
-                                        <th>&nbsp;</th>
+                                        <th scope="col">{{ trans('list.description') }}</th>
+                                        <th scope="col">{{ trans('list.amount') }}</th>
+                                        <th scope="col">{{ trans('list.date') }}</th>
+                                        <th scope="col">{{ trans('list.category') }}</th>
+                                        <th scope="col">{{ trans('list.budget') }}</th>
+                                        <th scope="col">{{ trans('list.tags') }}</th>
+                                        <th scope="col">{{ 'actions'|_ }}</th>
                                     </tr>
                                     </thead>
                                     <tbody>
@@ -100,9 +100,9 @@
                         </p>
                         <div class="row">
                             <div class="col-lg-8 col-md-12 col-sm-12 col-xs-12">
-                                <table class="table table-striped table-condensed">
+                                <table class="table table-striped table-condensed" aria-label="{{ 'bulk_edit_options_table'|_ }}">
                                     <tr>
-                                        <th style="width:25%;">{{ trans('list.category') }}</th>
+                                        <th scope="row" style="width:25%;">{{ trans('list.category') }}</th>
                                         <td>
                                             <input class="form-control" placeholder="" name="category" autocomplete="off" type="text" value="" spellcheck="false">
                                         </td>
@@ -116,7 +116,7 @@
                                         </td>
                                     </tr>
                                     <tr>
-                                        <th>{{ trans('list.budget') }}</th>
+                                        <th scope="row">{{ trans('list.budget') }}</th>
                                         <td>
                                             <select class="form-control" name="budget_id">
                                                 {% for id, budget in budgetList %}
@@ -134,7 +134,7 @@
                                         </td>
                                     </tr>
                                     <tr>
-                                        <th>{{ trans('list.tags') }}</th>
+                                        <th scope="row">{{ trans('list.tags') }}</th>
                                         <td>
                                             <input class="form-control" placeholder="" name="tags" autocomplete="off" type="text" value="" spellcheck="false">
                                         </td>
diff --git a/resources/views/transactions/convert.twig b/resources/views/transactions/convert.twig
index ebf89c4ca99..d3a2a2848f1 100644
--- a/resources/views/transactions/convert.twig
+++ b/resources/views/transactions/convert.twig
@@ -5,6 +5,7 @@
 {% endblock %}
 
 {% block content %}
+    <h1 class="sr-only">{{ 'convert_transaction'|_ }}</h1>
     <form method="POST" action="{{ route('transactions.convert.index.post', [destinationType.type|lower, group.id]) }}"
           accept-charset="UTF-8"
           class="form-horizontal"
@@ -14,7 +15,7 @@
             <div class="col-lg-8 col-lg-offset-2 col-md-12 col-sm-12">
                 <div class="box box-primary">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ ('convert_options_'~sourceType.type~destinationType.type)|_ }}</h3>
+                        <h2 class="box-title">{{ ('convert_options_'~sourceType.type~destinationType.type)|_ }}</h2>
                     </div>
                     <div class="box-body">
                         <p>
@@ -55,14 +56,17 @@
                             {% endif %}
                         </p>
 
-                        <table class="table">
-                            <tr>
-                                <th style="width:10%;">ID</th>
-                                <th style="width:25%;">Description</th>
-                                <th style="width:25%;">Source account</th>
-                                <th style="width:25%;">Destination account</th>
-                                <th style="width:15%;">Amount</th>
-                            </tr>
+                        <table class="table" aria-label="{{ 'transaction_conversion_table'|_ }}">
+                            <thead>
+                                <tr>
+                                    <th scope="col" style="width:10%;">ID</th>
+                                    <th scope="col" style="width:25%;">Description</th>
+                                    <th scope="col" style="width:25%;">Source account</th>
+                                    <th scope="col" style="width:25%;">Destination account</th>
+                                    <th scope="col" style="width:15%;">Amount</th>
+                                </tr>
+                            </thead>
+                            <tbody>
                             {% for transaction in groupArray.transactions %}
                                 <tr>
                                     <td>#{{ transaction.transaction_journal_id }}</td>
@@ -278,6 +282,7 @@
                                     </td>
                                 </tr>
                             {% endfor %}
+                            </tbody>
                         </table>
                     </div>
                     <div class="box-footer">
diff --git a/resources/views/transactions/delete.twig b/resources/views/transactions/delete.twig
index 5589e90e027..92c34e7dba9 100644
--- a/resources/views/transactions/delete.twig
+++ b/resources/views/transactions/delete.twig
@@ -12,7 +12,7 @@
             <div class="col-lg-6 col-lg-offset-3 col-md-6 col-sm-12">
                 <div class="box box-danger">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ trans('form.delete_journal', {'description': group.title|default(journal.description)}) }}</h3>
+                        <h1 class="box-title">{{ trans('form.delete_journal', {'description': group.title|default(journal.description)}) }}</h1>
                     </div>
                     <div class="box-body">
                         <p class="text-danger">
diff --git a/resources/views/transactions/index.twig b/resources/views/transactions/index.twig
index fd0fef5ff2a..f027f7ec327 100644
--- a/resources/views/transactions/index.twig
+++ b/resources/views/transactions/index.twig
@@ -6,6 +6,8 @@
 
 {% block content %}
 
+    <h1 class="sr-only">{{ subTitle }}</h1>
+
     {# upper show-all instruction #}
     {% if periods|length > 0 %}
         <div class="row">
@@ -23,7 +25,7 @@
             <div class="{{ boxSize }}">
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'categories'|_ }}</h3>
+                        <h2 class="box-title">{{ 'categories'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         <canvas id="category_chart" style="width:100%;height:250px;" height="250"></canvas>
@@ -35,7 +37,7 @@
                 <div class="{{ boxSize }}">
                     <div class="box">
                         <div class="box-header with-border">
-                            <h3 class="box-title">{{ 'budgets'|_ }}</h3>
+                            <h2 class="box-title">{{ 'budgets'|_ }}</h2>
                         </div>
                         <div class="box-body">
                             <canvas id="budget_chart" style="width:100%;height:250px;" height="250"></canvas>
@@ -47,7 +49,7 @@
                 <div class="{{ boxSize }}">
                     <div class="box">
                         <div class="box-header with-border">
-                            <h3 class="box-title">{{ 'all_source_accounts'|_ }}</h3>
+                            <h2 class="box-title">{{ 'all_source_accounts'|_ }}</h2>
                         </div>
                         <div class="box-body">
                             <canvas id="source_chart" style="width:100%;height:250px;" height="250"></canvas>
@@ -59,7 +61,7 @@
             <div class="{{ boxSize }}">
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'all_destination_accounts'|_ }}</h3>
+                        <h2 class="box-title">{{ 'all_destination_accounts'|_ }}</h2>
                     </div>
                     <div class="box-body">
                         <canvas id="destination_chart" style="width:100%;height:250px;" height="250"></canvas>
@@ -74,7 +76,7 @@
         <div class="{% if periods|length > 0 %}col-lg-10 col-md-10 col-sm-12{% else %}col-lg-12 col-md-12 col-sm-12{% endif %}">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ subTitle }}</h3>
+                    <h2 class="box-title">{{ subTitle }}</h2>
                 </div>
                 <div class="box-body no-padding">
                     <div style="padding:8px;">
diff --git a/resources/views/transactions/links/delete.twig b/resources/views/transactions/links/delete.twig
index b78bda5769c..664be05bb96 100644
--- a/resources/views/transactions/links/delete.twig
+++ b/resources/views/transactions/links/delete.twig
@@ -12,7 +12,7 @@
             <div class="col-lg-6 col-lg-offset-3 col-md-6 col-sm-12">
                 <div class="box box-danger">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ trans('firefly.delete_journal_link', {source: link.source.description|escape, destination: link.destination.description|escape, source_link: route('transactions.show', [link.source_id]) , destination_link: route('transactions.show',link.destination_id)})|raw }}</h3>
+                        <h1 class="box-title">{{ trans('firefly.delete_journal_link', {source: link.source.description|escape, destination: link.destination.description|escape, source_link: route('transactions.show', [link.source_id]) , destination_link: route('transactions.show',link.destination_id)})|raw }}</h1>
                     </div>
                     <div class="box-body">
                         <p class="text-danger">
diff --git a/resources/views/transactions/links/modal.twig b/resources/views/transactions/links/modal.twig
index ecd38eaf0f0..59672838c2d 100644
--- a/resources/views/transactions/links/modal.twig
+++ b/resources/views/transactions/links/modal.twig
@@ -4,7 +4,7 @@
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-header">
-                <h4 class="modal-title">{{ 'link_to_other_transaction'|_ }}</h4>
+                <h2 class="modal-title">{{ 'link_to_other_transaction'|_ }}</h2>
             </div>
             <div class="modal-body" id="helpBody">
                 <p>{{ 'select_transaction_to_link'|_ }}</p>
diff --git a/resources/views/transactions/mass/delete.twig b/resources/views/transactions/mass/delete.twig
index 0de4cacdb0b..24864c7dd33 100644
--- a/resources/views/transactions/mass/delete.twig
+++ b/resources/views/transactions/mass/delete.twig
@@ -12,7 +12,7 @@
             <div class="col-lg-8 col-lg-offset-2 col-md-8 coll-offset-md-2 col-sm-12">
                 <div class="box box-danger">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'mass_delete_journals'|_ }}</h3>
+                        <h1 class="box-title">{{ 'mass_delete_journals'|_ }}</h1>
                     </div>
                     <div class="box-body">
                         <p class="text-danger">
@@ -24,16 +24,19 @@
                             {{ trans('form.mass_make_selection') }}
                         </p>
 
-                        <table class="table table-striped table-condensed">
+                        <table class="table table-striped table-condensed" aria-label="{{ 'transactions_to_delete'|_ }}">
+                            <thead>
                             <tr>
-                                <th>&nbsp;</th>
-                                <th>{{ trans('list.transaction_type') }}</th>
-                                <th>{{ trans('list.description') }}</th>
-                                <th>{{ trans('list.amount') }}</th>
-                                <th class="hidden-sm hidden-xs">{{ trans('list.date') }}</th>
-                                <th class="hidden-xs">{{ trans('list.from') }}</th>
-                                <th class="hidden-xs">{{ trans('list.to') }}</th>
+                                <th scope="col">&nbsp;</th>
+                                <th scope="col">{{ trans('list.transaction_type') }}</th>
+                                <th scope="col">{{ trans('list.description') }}</th>
+                                <th scope="col">{{ trans('list.amount') }}</th>
+                                <th scope="col" class="hidden-sm hidden-xs">{{ trans('list.date') }}</th>
+                                <th scope="col" class="hidden-xs">{{ trans('list.from') }}</th>
+                                <th scope="col" class="hidden-xs">{{ trans('list.to') }}</th>
                             </tr>
+                            </thead>
+                            <tbody>
                             {% for journal in journals %}
                                 <tr>
                                     <td>
@@ -95,6 +98,7 @@
                                     </td>
                                 </tr>
                             {% endfor %}
+                            </tbody>
                         </table>
 
                     </div>
diff --git a/resources/views/transactions/mass/edit.twig b/resources/views/transactions/mass/edit.twig
index cc47fd9ecfe..a37ceaba72c 100644
--- a/resources/views/transactions/mass/edit.twig
+++ b/resources/views/transactions/mass/edit.twig
@@ -20,17 +20,20 @@
                             <span class="text-danger">{{ 'cannot_change_amount_reconciled'|_ }}</span>
                         </p>
 
-                        <table class="table table-striped table-condensed">
+                        <table class="table table-striped table-condensed" aria-label="{{ 'mass_edit_journals'|_ }}">
+                            <thead>
                             <tr>
-                                <th class="">&nbsp;</th>
-                                <th class="col-lg-2 col-md-2 col-sm-2">{{ trans('list.description') }}</th>
-                                <th class="col-lg-1 col-md-1 col-sm-1">{{ trans('list.amount') }}</th>
-                                <th class="col-lg-1 col-md-1 col-sm-1">{{ trans('list.date') }}</th>
-                                <th class="col-lg-2 col-md-2 col-sm-2">{{ trans('list.from') }}</th>
-                                <th class="col-lg-2 col-md-2 col-sm-2">{{ trans('list.to') }}</th>
-                                <th class="col-lg-2 col-md-2 col-sm-2">{{ trans('list.category') }}</th>
-                                <th class="col-lg-2 col-md-2 col-sm-2">{{ trans('list.budget') }}</th>
+                                <th scope="col" class="">&nbsp;</th>
+                                <th scope="col" class="col-lg-2 col-md-2 col-sm-2">{{ trans('list.description') }}</th>
+                                <th scope="col" class="col-lg-1 col-md-1 col-sm-1">{{ trans('list.amount') }}</th>
+                                <th scope="col" class="col-lg-1 col-md-1 col-sm-1">{{ trans('list.date') }}</th>
+                                <th scope="col" class="col-lg-2 col-md-2 col-sm-2">{{ trans('list.from') }}</th>
+                                <th scope="col" class="col-lg-2 col-md-2 col-sm-2">{{ trans('list.to') }}</th>
+                                <th scope="col" class="col-lg-2 col-md-2 col-sm-2">{{ trans('list.category') }}</th>
+                                <th scope="col" class="col-lg-2 col-md-2 col-sm-2">{{ trans('list.budget') }}</th>
                             </tr>
+                            </thead>
+                            <tbody>
                             {% for journal in journals %}
                                 <tr>
                                     <td>
@@ -169,6 +172,7 @@
                                     </td>
                                 </tr>
                             {% endfor %}
+                            </tbody>
                         </table>
                     </div>
                     <div class="box-footer">
diff --git a/resources/views/transactions/show.twig b/resources/views/transactions/show.twig
index cb0c6c1f3a7..b434bbb89bd 100644
--- a/resources/views/transactions/show.twig
+++ b/resources/views/transactions/show.twig
@@ -5,11 +5,12 @@
 {% endblock %}
 
 {% block content %}
+    <h1 class="sr-only">{{ 'transaction_details'|_ }}: {{ transactionGroup.title ?: first.description }}</h1>
     <div class="row">
         <div class="col-lg-6">
             <div class="box box-primary">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'transaction_journal_information'|_ }}</h3>
+                    <h2 class="box-title">{{ 'transaction_journal_information'|_ }}</h2>
                     <div class="btn-group btn-group-xs pull-right">
                         <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"
                                 aria-haspopup="true" aria-expanded="false">
@@ -60,14 +61,20 @@
                     </div>
                 </div>
                 <div class="box-body no-padding">
-                    <table class="table table-hover">
+                    <table class="table table-hover" aria-label="{{ 'transaction_journal_information'|_ }}">
+                        <thead class="sr-only">
+                            <tr>
+                                <th scope="col">{{ 'property'|_ }}</th>
+                                <th scope="col">{{ 'value'|_ }}</th>
+                            </tr>
+                        </thead>
                         <tbody>
                         <tr>
-                            <td style="width:40%;">{{ trans('list.type') }}</td>
+                            <th scope="row" style="width:40%;">{{ trans('list.type') }}</th>
                             <td>{{ first.transaction_type_type|_ }}</td>
                         </tr>
                         <tr>
-                            <td>{{ trans('list.description') }}</td>
+                            <th scope="row">{{ trans('list.description') }}</th>
                             <td>
                                 {% if splits == 1 %}
                                     {{ first.description }}
@@ -77,7 +84,7 @@
                             </td>
                         </tr>
                         <tr>
-                            <td style="width:30%;">{{ trans('list.date') }}</td>
+                            <th scope="row" style="width:30%;">{{ trans('list.date') }}</th>
                             <td>
                                 <span class="date-time" data-date="{{ first.date.toIso8601ZuluString() }}" title="{{ first.date.isoFormat(dateTimeFormat) }}{% if(first.date_tz != '') %} ({{ trans('firefly.stored_in_tz', {timezone: first.date_tz }) }}, {{ trans('firefly.displayed_in_tz', {timezone: config('app.timezone') }) }}){% endif %}">
                                 {{ first.date.isoFormat(dateTimeFormat) }}
@@ -94,9 +101,9 @@
             {% if groupLogEntries|length > 0 %}
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">
+                        <h2 class="box-title">
                             {{ 'audit_log_entries'|_ }}
-                        </h3>
+                        </h2>
                     </div>
                     <div class="box-body no-padding">
                         {% include 'list.ale' with {logEntries: groupLogEntries} %}
@@ -108,16 +115,22 @@
         <div class="col-lg-6">
             <div class="box box-primary">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'transaction_journal_meta'|_ }}</h3>
+                    <h2 class="box-title">{{ 'transaction_journal_meta'|_ }}</h2>
                 </div>
                 <div class="box-body no-padding">
-                    <table class="table table-hover">
+                    <table class="table table-hover" aria-label="{{ 'transaction_journal_meta'|_ }}">
+                        <thead class="sr-only">
+                            <tr>
+                                <th scope="col">{{ 'property'|_ }}</th>
+                                <th scope="col">{{ 'value'|_ }}</th>
+                            </tr>
+                        </thead>
                         <tbody>
                         {% if first.transaction_type_type != 'Withdrawal' or splits == 1 %}
                             <tr>
-                                <td style="width:40%;">
+                                <th scope="row" style="width:40%;">
                                     {{ trans_choice('firefly.source_accounts', accounts['source']|length ) }}
-                                </td>
+                                </th>
                                 <td>
                                     {% for account in accounts['source'] %}
                                         {% if 'Cash account' == account.type %}
@@ -136,10 +149,10 @@
 
                         {% if first.transaction_type_type != 'Deposit' or splits == 1 %}
                             <tr>
-                                <td>
+                                <th scope="row">
                                     {{ trans_choice('firefly.destination_accounts', accounts['destination']|length ) }}
 
-                                </td>
+                                </th>
                                 <td>
                                     {% for account in accounts['destination'] %}
                                         {% if 'Cash account' == account.type %}
@@ -156,7 +169,7 @@
                             </tr>
                         {% endif %}
                         <tr>
-                            <td style="width:30%;">{{ 'total_amount'|_ }}</td>
+                            <th scope="row" style="width:30%;">{{ 'total_amount'|_ }}</th>
                             <td>
                                 {% for amount in amounts %}
                                     {% if first.transaction_type_type == 'Withdrawal' %}
@@ -190,7 +203,7 @@
     {% if splits > 1 %}
         <div class="row">
             <div class="col-lg-12">
-                <h3>{{ 'splits'|_ }}</h3>
+                <h2>{{ 'splits'|_ }}</h2>
             </div>
         </div>
     {% endif %}
@@ -209,7 +222,7 @@
                         <h3 class="box-title">
                             {{ journal.description }}
                             {% if journal.reconciled %}
-                                <span class="fa fa-check"></span>
+                                <span class="fa fa-check" aria-label="{{ 'reconciled'|_ }}"></span>
                             {% endif %}
                             {% if splits > 1 %}
                                 <small>
@@ -286,7 +299,13 @@
                         </div>
                     </div>
                     <div class="box-body no-padding">
-                        <table class="table">
+                        <table class="table" aria-label="{{ 'transaction_details'|_ }}">
+                            <thead class="sr-only">
+                                <tr>
+                                    <th scope="col">{{ 'transaction_flow'|_ }}</th>
+                                </tr>
+                            </thead>
+                            <tbody>
                             <tr>
                                 <td colspan="2">
                                     <!-- type is: "{{ first.transaction_type_type }}" -->
@@ -361,7 +380,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td>{{ 'transaction_journal_id'|_ }}</td>
+                                <th scope="row">{{ 'transaction_journal_id'|_ }}</th>
                                 <td>#{{ journal.transaction_journal_id }}</td>
                             </tr>
                             {% if null != journal.category_id %}
@@ -440,10 +459,10 @@
                                     <td style="width:40%;">{{ 'tags'|_ }}</td>
                                     <td>
                                         {% for tag in journal.tags %}
-                                            <h4 style="display: inline;"><a class="label label-success"
+                                            <span style="display: inline;"><a class="label label-success"
                                                                             href="{{ route('tags.show', tag.id) }}">
-                                                    <span class="fa fa-fw fa-tag"></span>{{ tag.tag }}</a>
-                                            </h4>
+                                                    <span class="fa fa-fw fa-tag" aria-hidden="true"></span>{{ tag.tag }}</a>
+                                            </span>
                                         {% endfor %}
                                     </td>
                                 </tr>
@@ -456,9 +475,9 @@
                 {% if links[journal.transaction_journal_id]|length > 0 %}
                     <div class="box">
                         <div class="box-header with-border">
-                            <h3 class="box-title">
+                            <h4 class="box-title">
                                 {{ 'journal_links'|_ }}
-                            </h3>
+                            </h4>
                         </div>
                         <div class="box-body no-padding">
                             <table class="table">
@@ -498,7 +517,7 @@
                 {% if attachments[journal.transaction_journal_id]|length > 0 %}
                     <div class="box">
                         <div class="box-header with-border">
-                            <h3 class="box-title">{{ 'attachments'|_ }}</h3>
+                            <h4 class="box-title">{{ 'attachments'|_ }}</h4>
                         </div>
                         <div class="box-body no-padding">
                             {% include 'list.attachments' with {attachments: attachments[journal.transaction_journal_id]} %}
@@ -510,7 +529,7 @@
                 {% if events[journal.transaction_journal_id]|length > 0 %}
                     <div class="box">
                         <div class="box-header with-border">
-                            <h3 class="box-title">{{ 'piggy_events'|_ }}</h3>
+                            <h4 class="box-title">{{ 'piggy_events'|_ }}</h4>
                         </div>
                         <div class="box-body no-padding">
                             <table class="table table-hover">
@@ -543,7 +562,7 @@
         {% endfor %}
     </div>
     {# modal for linking journals. Will be filled by AJAX #}
-    <div class="modal fade" tabindex="-1" role="dialog" id="linkJournalModal">
+    <div class="modal fade" tabindex="-1" role="dialog" id="linkJournalModal" aria-labelledby="linkJournalModalLabel" aria-describedby="linkJournalModalDescription" aria-hidden="true">
     </div>
 {% endblock %}
 {% block scripts %}
diff --git a/resources/views/transactions/single/delete.twig b/resources/views/transactions/single/delete.twig
index 37485aeedca..cc5d208f384 100644
--- a/resources/views/transactions/single/delete.twig
+++ b/resources/views/transactions/single/delete.twig
@@ -12,7 +12,7 @@
             <div class="col-lg-6 col-lg-offset-3 col-md-6 col-sm-12">
                 <div class="box box-danger">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ trans('form.delete_journal', {'description': journal.description}) }}</h3>
+                        <h1 class="box-title">{{ trans('form.delete_journal', {'description': journal.description}) }}</h1>
                     </div>
                     <div class="box-body">
                         <p class="text-danger">
diff --git a/resources/views/v2/accounts/index.blade.php b/resources/views/v2/accounts/index.blade.php
index 05d54582ae1..f2bb6b5ebf4 100644
--- a/resources/views/v2/accounts/index.blade.php
+++ b/resources/views/v2/accounts/index.blade.php
@@ -2,12 +2,13 @@
 @section('content')
     <div class="app-content">
         <div class="container-fluid" x-data="index">
+            <h1 class="visually-hidden">{{ __('firefly.accounts') }}</h1>
             <x-messages></x-messages>
             <div class="row mb-3">
                 <div class="col-xl-4 col-lg-6 col-md-12 col-sm-12 col-xs-12">
                     <div class="card">
                         <div class="card-header">
-                            <h3 class="card-title">{{ __('firefly.net_worth') }}</h3>
+                            <h2 class="card-title">{{ __('firefly.net_worth') }}</h2>
                         </div>
                         <div class="card-body">
                             TODO
@@ -17,7 +18,7 @@
                 <div class="col-xl-4 col-lg-6 col-md-12 col-sm-12 col-xs-12">
                     <div class="card">
                         <div class="card-header">
-                            <h3 class="card-title">{{ __('firefly.in_out_period') }}</h3>
+                            <h2 class="card-title">{{ __('firefly.in_out_period') }}</h2>
                         </div>
                         <div class="card-body">
                             TODO
@@ -27,7 +28,7 @@
                 <div class="col-xl-4 col-lg-6 col-md-12 col-sm-12 col-xs-12">
                     <div class="card">
                         <div class="card-header">
-                            <h3 class="card-title">TODO</h3>
+                            <h2 class="card-title">TODO</h2>
                         </div>
                         <div class="card-body">
                             TODO
@@ -47,17 +48,17 @@
                         <div class="card-header">
                             <div class="row">
                                 <div class="col">
-                                    <h3 class="card-title">
+                                    <h2 class="card-title">
                                         <span x-show="null === set.group.id">{{ __('firefly.undefined_accounts') }}</span>
                                         <span x-show="null !== set.group.id" x-text="set.group.title"></span>
-                                    </h3>
+                                    </h2>
                                 </div>
                                 <div class="col text-end">
                                 </div>
                             </div>
                         </div>
                         <div class="card-body p-0">
-                            <table class="table">
+                            <table class="table" role="table" aria-label="{{ __('firefly.accounts_table') }}"
                                 <thead>
                                 <tr x-show="hasFilters()">
                                     <td x-show="tableColumns.drag_and_drop.visible && tableColumns.drag_and_drop.enabled">
@@ -96,22 +97,22 @@
                                     <td x-show="tableColumns.menu.visible && tableColumns.menu.enabled">&nbsp;</td>
                                 </tr>
                                 <tr>
-                                    <th x-show="tableColumns.drag_and_drop.visible && tableColumns.drag_and_drop.enabled">
+                                    <th x-show="tableColumns.drag_and_drop.visible && tableColumns.drag_and_drop.enabled" scope="col" aria-label="{{ __('firefly.drag_and_drop') }}">
                                         &nbsp;
                                     </th>
-                                    <th x-show="tableColumns.active.visible && tableColumns.active.enabled">
-                                        <a href="#" x-on:click.prevent="sort('active')">{{ __('list.active') }}</a>
+                                    <th x-show="tableColumns.active.visible && tableColumns.active.enabled" scope="col">
+                                        <a href="#" x-on:click.prevent="sort('active')" :aria-label="'{{ __('list.active') }}' + (pageOptions.sortingColumn === 'active' ? (pageOptions.sortDirection === 'asc' ? ' {{ __('firefly.sorted_ascending') }}' : ' {{ __('firefly.sorted_descending') }}') : '')">{{ __('list.active') }}</a>
                                         <em x-show="pageOptions.sortingColumn === 'active' && pageOptions.sortDirection === 'asc'"
-                                            class="fa-solid fa-arrow-down-short-wide"></em>
+                                            class="fa-solid fa-arrow-down-short-wide" aria-hidden="true"></em>
                                         <em x-show="pageOptions.sortingColumn === 'active' && pageOptions.sortDirection === 'desc'"
-                                            class="fa-solid fa-arrow-down-wide-short"></em>
+                                            class="fa-solid fa-arrow-down-wide-short" aria-hidden="true"></em>
                                     </th>
-                                    <th x-show="tableColumns.name.visible && tableColumns.name.enabled">
-                                        <a href="#" x-on:click.prevent="sort('name')">{{ __('list.name') }}</a>
+                                    <th x-show="tableColumns.name.visible && tableColumns.name.enabled" scope="col">
+                                        <a href="#" x-on:click.prevent="sort('name')" :aria-label="'{{ __('list.name') }}' + (pageOptions.sortingColumn === 'name' ? (pageOptions.sortDirection === 'asc' ? ' {{ __('firefly.sorted_ascending') }}' : ' {{ __('firefly.sorted_descending') }}') : '')">{{ __('list.name') }}</a>
                                         <em x-show="pageOptions.sortingColumn === 'name' && pageOptions.sortDirection === 'asc'"
-                                            class="fa-solid fa-arrow-down-a-z"></em>
-                                        <em x-show="pageOptions.sortingColumn === 'name' && pageOptions.sortDirection === 'desc'" class="fa-solid fa-arrow-down-z-a"></em>
-                                        <a @click.prevent="showFilterDialog('name')" href="#" data-bs-toggle="modal" data-bs-target="#filterModal"><em class="fa-solid fa-magnifying-glass"></em></a>
+                                            class="fa-solid fa-arrow-down-a-z" aria-hidden="true"></em>
+                                        <em x-show="pageOptions.sortingColumn === 'name' && pageOptions.sortDirection === 'desc'" class="fa-solid fa-arrow-down-z-a" aria-hidden="true"></em>
+                                        <a @click.prevent="showFilterDialog('name')" href="#" data-bs-toggle="modal" data-bs-target="#filterModal" aria-label="{{ __('firefly.filter_by_name') }}"><em class="fa-solid fa-magnifying-glass" aria-hidden="true"></em></a>
 
                                     </th>
                                     <th x-show="tableColumns.type.visible && tableColumns.type.enabled">{{ __('list.type') }}</th>
diff --git a/resources/views/v2/administrations/create.blade.php b/resources/views/v2/administrations/create.blade.php
index d1c9597f6b9..5ba3d443792 100644
--- a/resources/views/v2/administrations/create.blade.php
+++ b/resources/views/v2/administrations/create.blade.php
@@ -6,13 +6,14 @@
     <div class="app-content">
         <!--begin::Container-->
         <div class="container-fluid" x-data="administrations" id="form">
+            <h1 class="sr-only">{{ __('firefly.create_new_administration') }}</h1>
             <x-messages></x-messages>
             <div class="row mb-3">
                 <div class="col-xl-6 col-lg-6 col-md-12 col-xs-12">
                     <div class="card">
                         <div class="card-header">
-                            <h3 class="card-title"
-                            >{{ __('firefly.basic_administration_information') }}</h3>
+                            <h2 class="card-title"
+                            >{{ __('firefly.basic_administration_information') }}</h2>
                         </div>
                         <div class="card-body">
                             <!-- TITLE -->
@@ -25,9 +26,9 @@
                 <div class="col-xl-6 col-lg-6 col-md-12 col-xs-12">
                     <div class="card">
                         <div class="card-header">
-                            <h3 class="card-title">
+                            <h2 class="card-title">
                                 {{ __('firefly.submission_options') }}
-                            </h3>
+                            </h2>
                         </div>
                         <div class="card-body">
                             @include('partials.form.submission-options')
diff --git a/resources/views/v2/administrations/edit.blade.php b/resources/views/v2/administrations/edit.blade.php
index cf0201eb3bc..c06d115bdc8 100644
--- a/resources/views/v2/administrations/edit.blade.php
+++ b/resources/views/v2/administrations/edit.blade.php
@@ -6,13 +6,14 @@
     <div class="app-content">
         <!--begin::Container-->
         <div class="container-fluid" x-data="administrations" id="form">
+            <h1 class="sr-only">{{ __('firefly.edit_administration') }}</h1>
             <x-messages></x-messages>
             <div class="row mb-3">
                 <div class="col-xl-6 col-lg-6 col-md-12 col-xs-12">
                     <div class="card">
                         <div class="card-header">
-                            <h3 class="card-title"
-                            >{{ __('firefly.basic_administration_information') }}</h3>
+                            <h2 class="card-title"
+                            >{{ __('firefly.basic_administration_information') }}</h2>
                         </div>
                         <div class="card-body">
                             <!-- TITLE -->
@@ -25,9 +26,9 @@
                 <div class="col-xl-6 col-lg-6 col-md-12 col-xs-12">
                     <div class="card">
                         <div class="card-header">
-                            <h3 class="card-title">
+                            <h2 class="card-title">
                                 {{ __('firefly.submission_options') }}
-                            </h3>
+                            </h2>
                         </div>
                         <div class="card-body">
                             @include('partials.form.submission-options')
diff --git a/resources/views/v2/administrations/index.blade.php b/resources/views/v2/administrations/index.blade.php
index 0afc3eb2cb5..d5e00147392 100644
--- a/resources/views/v2/administrations/index.blade.php
+++ b/resources/views/v2/administrations/index.blade.php
@@ -19,11 +19,11 @@ class="btn btn-primary">{{ __('firefly.create_administration') }}</a>
                     <div class="col-xl-4 col-lg-4 col-sm-6 col-xs-12 mb-3">
                         <div :class="{'card': true, 'card-primary': group.in_use}">
                             <div class="card-header">
-                                <h3 class="card-title">
+                                <h2 class="card-title">
                                     <template x-if="group.in_use">
                                         <em class="fa-regular fa-square-check"></em>
                                     </template>
-                                    Administration "<span x-text="group.title"></span>"</h3>
+                                    Administration "<span x-text="group.title"></span>"</h2>
                             </div>
                             <div class="card-body">
                                 <ul>
@@ -36,7 +36,7 @@ class="btn btn-primary">{{ __('firefly.create_administration') }}</a>
                                 </ul>
                                 <template x-if="group.memberCountExceptYou > 0">
                                     <div>
-                                        <h5>{{ __('firefly.other_users_in_admin') }}</h5>
+                                        <h3>{{ __('firefly.other_users_in_admin') }}</h3>
                                     <ul>
                                         <template x-for="(member, jndex) in group.members" :key="jndex">
                                             <li>
diff --git a/resources/views/v2/components/transaction-split.blade.php b/resources/views/v2/components/transaction-split.blade.php
index e03ae6837ef..7d6a300c869 100644
--- a/resources/views/v2/components/transaction-split.blade.php
+++ b/resources/views/v2/components/transaction-split.blade.php
@@ -5,7 +5,7 @@
             <!-- BASIC TRANSACTION INFORMATION -->
             <div class="card">
                 <div class="card-header">
-                    <h3 class="card-title"
+                    <h3 class="card-title" id="basic-info-{{ index }}"
                     >{{ __('firefly.basic_journal_information') }}</h3>
                 </div>
                 <div class="card-body">
@@ -28,7 +28,7 @@
             <!-- AMOUNTS -->
             <div class="card">
                 <div class="card-header">
-                    <h3 class="card-title">
+                    <h3 class="card-title" id="amount-info-{{ index }}">
                         {{ __('firefly.transaction_journal_amount') }}
                     </h3>
                 </div>
@@ -45,7 +45,7 @@
         <div class="col-xl-4 col-lg-6 col-md-12 col-xs-12 mb-2">
             <div class="card">
                 <div class="card-header">
-                    <h3 class="card-title">
+                    <h3 class="card-title" id="meta-info-{{ index }}">
                         {{ __('firefly.transaction_journal_meta') }}
                     </h3>
                 </div>
@@ -75,7 +75,7 @@
         <div class="col-xl-4 col-lg-6 col-md-12 col-xs-12 mb-2">
             <div class="card">
                 <div class="card-header">
-                    <h3 class="card-title">
+                    <h3 class="card-title" id="extra-info-{{ index }}">
                         {{ __('firefly.transaction_journal_extra') }}
                     </h3>
                 </div>
@@ -100,7 +100,7 @@
         <div class="col-xl-4 col-lg-6 col-md-12 col-xs-12 mb-2">
             <div class="card">
                 <div class="card-header">
-                    <h3 class="card-title">
+                    <h3 class="card-title" id="submission-options-{{ index }}">
                         {{ __('firefly.submission_options') }}
                     </h3>
                 </div>
diff --git a/resources/views/v2/errors/FireflyException.blade.php b/resources/views/v2/errors/FireflyException.blade.php
index 5dfc2be6c8d..773e5614f60 100644
--- a/resources/views/v2/errors/FireflyException.blade.php
+++ b/resources/views/v2/errors/FireflyException.blade.php
@@ -19,16 +19,16 @@
     @if(!$debug)
         <div class="row">
             <div class="col">
-                <h4>
+                <h2>
                     {{ trans('errors.more_info') }}
-                </h4>
+                </h2>
                 <p>
                     {!! trans('errors.collect_info')  !!}
                     {!! trans('errors.collect_info_more')  !!}
                 </p>
-                <h4>
+                <h2>
                     {{ trans('errors.github_help') }}
-                </h4>
+                </h2>
                 <p>
                     {!! trans('errors.github_instructions') !!}
                 </p>
@@ -45,13 +45,13 @@
     @if($debug)
         <div class="row">
             <div class="col">
-                <h4>{{ trans('errors.error') }}</h4>
+                <h2>{{ trans('errors.error') }}</h2>
                 <p>
                     {!! trans('errors.error_location', ['file' => $exception->getFile(), 'line' =>  $exception->getLine(), 'code' => $exception->getCode() ]) !!}
                 </p>
-                <h4>
+                <h3>
                     {{ trans('errors.stacktrace') }}
-                </h4>
+                </h3>
                 <div style="font-family: monospace;font-size:11px;">
                     {!!  nl2br($exception->getTraceAsString())  !!}
                 </div>
diff --git a/resources/views/v2/index.blade.php b/resources/views/v2/index.blade.php
index baa97f179e7..9173d977557 100644
--- a/resources/views/v2/index.blade.php
+++ b/resources/views/v2/index.blade.php
@@ -37,7 +37,7 @@
                 <div class="col">
                     <div class="card">
                         <div class="card-header">
-                            <h3 class="card-title"><a href="#" title="Something">Income + sum</a></h3>
+                            <h2 class="card-title"><a href="#" title="Something">Income + sum</a></h2>
                         </div>
                         <div class="card-body">
                             <p>
@@ -54,7 +54,7 @@
             <div class="modal-dialog modal-lg">
                 <div class="modal-content">
                     <div class="modal-header">
-                        <h1 class="modal-title fs-5" id="internalsModalLabel">{{ __('firefly.page_settings_header') }}</h1>
+                        <h2 class="modal-title fs-5" id="internalsModalLabel">{{ __('firefly.page_settings_header') }}</h2>
                         <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
                     </div>
                     <div class="modal-body">
diff --git a/resources/views/v2/layout/v2.blade.php b/resources/views/v2/layout/v2.blade.php
index 43796d2d1fc..c8d96346a36 100644
--- a/resources/views/v2/layout/v2.blade.php
+++ b/resources/views/v2/layout/v2.blade.php
@@ -105,14 +105,14 @@
                 <!--begin::Row-->
                 <div class="row">
                     <div class="col-sm-6">
-                        <h3 class="mb-0">
+                        <h1 class="mb-0">
                             @if($mainTitleIcon)
                                 <em class="fa {{ $mainTitleIcon }}"></em>
                             @endif
                             {{ $title }} @if($subTitle)
                                 <small class="text-muted" id="pageSubTitle">
                                     {{$subTitle}}</small>
-                            @endif</h3>
+                            @endif</h1>
                     </div>
                     <div class="col-sm-6">
                         {{ Breadcrumbs::render() }}
diff --git a/resources/views/v2/partials/dashboard/account-chart.blade.php b/resources/views/v2/partials/dashboard/account-chart.blade.php
index d2fbd67559e..dcef1d261c9 100644
--- a/resources/views/v2/partials/dashboard/account-chart.blade.php
+++ b/resources/views/v2/partials/dashboard/account-chart.blade.php
@@ -2,9 +2,9 @@
     <div class="col">
         <div class="card">
             <div class="card-header">
-                <h3 class="card-title"><a href="{{ route('accounts.index',['asset']) }}"
+                <h2 class="card-title"><a href="{{ route('accounts.index',['asset']) }}"
                                           title="{{ __('firefly.yourAccounts') }}">{{ __('firefly.yourAccounts') }}</a>
-                </h3>
+                </h2>
             </div>
             <div class="card-body p-0" style="position: relative;height:400px;">
                 <canvas id="account-chart"></canvas>
diff --git a/resources/views/v2/partials/dashboard/account-list.blade.php b/resources/views/v2/partials/dashboard/account-list.blade.php
index 6f86903ccea..be497043059 100644
--- a/resources/views/v2/partials/dashboard/account-list.blade.php
+++ b/resources/views/v2/partials/dashboard/account-list.blade.php
@@ -8,7 +8,7 @@
         <div class="col-12 mb-2" x-model="account">
             <div class="card">
                 <div class="card-header">
-                    <h3 class="card-title">
+                    <h2 class="card-title">
                         <a :href="'{{ route('accounts.show', '') }}/' + account.id"
                            x-text="account.name"></a>
 
@@ -26,7 +26,13 @@
                     <p class="text-center small" x-show="account.groups.length < 1">
                         {{ __('firefly.no_transactions_period') }}
                     </p>
-                    <table class="table table-sm" x-show="account.groups.length > 0">
+                    <table class="table table-sm" x-show="account.groups.length > 0" aria-label="{{ __('firefly.recent_transactions') }}">
+                        <thead class="sr-only">
+                            <tr>
+                                <th scope="col">{{ __('firefly.description') }}</th>
+                                <th scope="col">{{ __('firefly.amount') }}</th>
+                            </tr>
+                        </thead>
                         <tbody>
                         <template x-for="group in account.groups">
                             <tr>
diff --git a/resources/views/v2/partials/dashboard/budget-chart.blade.php b/resources/views/v2/partials/dashboard/budget-chart.blade.php
index 33e81a7c9cb..17330af7927 100644
--- a/resources/views/v2/partials/dashboard/budget-chart.blade.php
+++ b/resources/views/v2/partials/dashboard/budget-chart.blade.php
@@ -2,9 +2,9 @@
     <div class="col">
         <div class="card">
             <div class="card-header">
-                <h3 class="card-title"><a href="{{ route('budgets.index') }}"
+                <h2 class="card-title"><a href="{{ route('budgets.index') }}"
                                           title="{{ __('firefly.go_to_budgets') }}">{{ __('firefly.budgetsAndSpending') }}</a>
-                </h3>
+                </h2>
             </div>
             <div class="card-body p-0" style="position: relative;height:350px;">
                 <canvas id="budget-chart"></canvas>
diff --git a/resources/views/v2/partials/dashboard/piggy-banks.blade.php b/resources/views/v2/partials/dashboard/piggy-banks.blade.php
index 53bdd2a23fe..66f27a67be6 100644
--- a/resources/views/v2/partials/dashboard/piggy-banks.blade.php
+++ b/resources/views/v2/partials/dashboard/piggy-banks.blade.php
@@ -3,8 +3,8 @@
     <template x-for="group in piggies">
         <div class="card mb-2">
             <div class="card-header">
-                <h3 class="card-title"><a href="{{ route('piggy-banks.index')  }}" title="{{ __('firefly.go_to_piggies')  }}">{{ __('firefly.piggy_banks') }}
-                        (<span x-text="group.title"></span>)</a></h3>
+                <h2 class="card-title"><a href="{{ route('piggy-banks.index')  }}" title="{{ __('firefly.go_to_piggies')  }}">{{ __('firefly.piggy_banks') }}
+                        (<span x-text="group.title"></span>)</a></h2>
             </div>
             <ul class="list-group list-group-flush">
                 <template x-for="piggy in group.piggies">
diff --git a/resources/views/v2/partials/dashboard/subscriptions.blade.php b/resources/views/v2/partials/dashboard/subscriptions.blade.php
index a1850cd1240..19511d6cee4 100644
--- a/resources/views/v2/partials/dashboard/subscriptions.blade.php
+++ b/resources/views/v2/partials/dashboard/subscriptions.blade.php
@@ -25,11 +25,11 @@
                 </div>
                 </template>
                 <div class="row mb-2">
-                    <table class="table table-striped table-hover">
+                    <table class="table table-striped table-hover" aria-label="{{ __('firefly.subscriptions') }}">
                         <thead>
                         <tr>
-                            <th>{{ __('firefly.subscription') }}</th>
-                            <th>{{ __('firefly.expected_amount') }}</th>
+                            <th scope="col">{{ __('firefly.subscription') }}</th>
+                            <th scope="col">{{ __('firefly.expected_amount') }}</th>
                         </tr>
                         </thead>
                         <tbody>
@@ -119,11 +119,11 @@
                     </div>
                 </div>
             </div>
-            <table class="table table-striped table-hover">
+            <table class="table table-striped table-hover" aria-label="Subscriptions">
                 <thead>
                 <tr>
-                    <th>Subscription</th>
-                    <th>(Expected) amount</th>
+                    <th scope="col">Subscription</th>
+                    <th scope="col">(Expected) amount</th>
                 </tr>
                 </thead>
                 <tbody>
diff --git a/resources/views/v2/transactions/index.blade.php b/resources/views/v2/transactions/index.blade.php
index 7463e4c60f2..921e7f63388 100644
--- a/resources/views/v2/transactions/index.blade.php
+++ b/resources/views/v2/transactions/index.blade.php
@@ -5,12 +5,13 @@
 @section('content')
     <div class="app-content">
         <div class="container-fluid" x-data="index">
+            <h1 class="sr-only">{{ 'transactions'|_ }}</h1>
             <x-messages></x-messages>
             <div class="row mb-3">
                 <div class="col-xl-4 col-lg-6 col-md-12 col-sm-12 col-xs-12">
                     <div class="card">
                         <div class="card-header">
-                            <h3 class="card-title">Info</h3>
+                            <h2 class="card-title">Info</h2>
                         </div>
                         <div class="card-body">
                             some chart
@@ -20,7 +21,7 @@
                 <div class="col-xl-4 col-lg-6 col-md-12 col-sm-12 col-xs-12">
                     <div class="card">
                         <div class="card-header">
-                            <h3 class="card-title">Info</h3>
+                            <h2 class="card-title">Info</h2>
                         </div>
                         <div class="card-body">
                             Same
@@ -30,7 +31,7 @@
                 <div class="col-xl-4 col-lg-6 col-md-12 col-sm-12 col-xs-12">
                     <div class="card">
                         <div class="card-header">
-                            <h3 class="card-title">Info</h3>
+                            <h2 class="card-title">Info</h2>
                         </div>
                         <div class="card-body">
                             Same
@@ -66,29 +67,29 @@
                     <div class="card">
                         <div class="card-header">
                             <div class="row">
-                                <h3 class="card-title">Transactions</h3>
+                                <h2 class="card-title">Transactions</h2>
                             </div>
                         </div>
                         <div class="card-body p-0">
 
 
-                            <table class="table table-hover table-striped">
+                            <table class="table table-hover table-striped" aria-label="Transactions list">
                                 <thead>
                                 <tr>
-                                    <th>
+                                    <th scope="col">
                                         Icon
                                     </th>
                                     <template x-if="tableColumns.description.enabled">
-                                        <th>Description</th>
+                                        <th scope="col">Description</th>
                                     </template>
                                     <template x-if="tableColumns.source.enabled">
-                                        <th>From</th>
+                                        <th scope="col">From</th>
                                     </template>
                                     <template x-if="tableColumns.destination.enabled">
-                                        <th>To</th>
+                                        <th scope="col">To</th>
                                     </template>
                                     <template x-if="tableColumns.amount.enabled">
-                                        <th>Amount</th>
+                                        <th scope="col">Amount</th>
                                     </template>
                                 </tr>
                                 </thead>
@@ -174,7 +175,7 @@
                 <div class="col-xl-2 col-lg-12 col-md-12 col-sm-12 col-xs-12">
                     <div class="card">
                         <div class="card-header">
-                            <h3 class="card-title">Sidebar</h3>
+                            <h2 class="card-title">Sidebar</h2>
                         </div>
                         <div class="card-body">
                             I like sidebar
diff --git a/resources/views/v2/transactions/show.blade.php b/resources/views/v2/transactions/show.blade.php
index 80f948b3534..577fe2472fe 100644
--- a/resources/views/v2/transactions/show.blade.php
+++ b/resources/views/v2/transactions/show.blade.php
@@ -13,10 +13,10 @@
                             <h3 class="card-title">{{ __('firefly.basic_journal_information') }}</h3>
                         </div>
                         <div class="card-body p-0">
-                            <table class="table table-x table-hover">
+                            <table class="table table-x table-hover" aria-label="{{ __('firefly.basic_journal_information') }}">
                                 <tbody>
                                 <tr>
-                                    <th style="width:10%;">
+                                    <th scope="row" style="width:10%;">
                                         <template x-if="'Withdrawal' === groupProperties.transactionType">
                                             <em class="fa fa-solid fa-arrow-left"
                                                 :title="groupProperties.transactionTypeTranslated"></em>
@@ -39,7 +39,7 @@
                                     <td><span class="group_title" :data-group="groupProperties.id" x-text="groupProperties.title"></span></td>
                                 </tr>
                                 <tr>
-                                    <th><em class="fa-solid fa-calendar-alt" title="{{ __('list.date') }}"/></th>
+                                    <th scope="row"><em class="fa-solid fa-calendar-alt" title="{{ __('list.date') }}"/></th>
                                     <td><span x-text="format(groupProperties.date)"></span></td>
                                 </tr>
                                 </tbody>
@@ -127,7 +127,7 @@ class="fa-solid fa-arrow-right"></em>
             </div>
             <div class="row mt-3">
                 <div class="col">
-                    <h4>{{ __('firefly.transaction_journal_information') }}</h4>
+                    <h2>{{ __('firefly.transaction_journal_information') }}</h2>
                 </div>
             </div>
             <div class="row">
@@ -138,7 +138,7 @@ class="fa-solid fa-arrow-right"></em>
 
                         <div class="card mb-3">
                             <div class="card-header">
-                                <h3 class="card-title">
+                                <h4 class="card-title">
                                     <span
                                         class="journal_description"
                                           data-type="text"
@@ -153,7 +153,7 @@ class="journal_description"
                                         <span x-text="index + 1"></span> / <span x-text="entries.length"></span>
                                     </span>
                                     </template>
-                                </h3>
+                                </h4>
                             </div>
                             <div class="card-body p-0">
                                 <table class="table table-x table-hover">
@@ -269,28 +269,28 @@ class="fa-solid fa-calendar"></em></td>
                         </div>
                         <div class="card mb-3">
                             <div class="card-header">
-                                <h3 class="card-title">Transaction links TODO</h3>
+                                <h4 class="card-title">Transaction links TODO</h4>
                             </div>
                             <div class="card-body p-0">
                             </div>
                         </div>
                         <div class="card mb-3">
                             <div class="card-header">
-                                <h3 class="card-title">Piggy bank events TODO</h3>
+                                <h4 class="card-title">Piggy bank events TODO</h4>
                             </div>
                             <div class="card-body p-0">
                             </div>
                         </div>
                         <div class="card mb-3">
                             <div class="card-header">
-                                <h3 class="card-title">Attachments TODO</h3>
+                                <h4 class="card-title">Attachments TODO</h4>
                             </div>
                             <div class="card-body p-0">
                             </div>
                         </div>
                         <div class="card mb-3">
                             <div class="card-header">
-                                <h3 class="card-title">Audit log entries TODO</h3>
+                                <h4 class="card-title">Audit log entries TODO</h4>
                             </div>
                             <div class="card-body p-0">
                             </div>
diff --git a/resources/views/webhooks/delete.twig b/resources/views/webhooks/delete.twig
index 54eef2a3f5c..440ab9103c5 100644
--- a/resources/views/webhooks/delete.twig
+++ b/resources/views/webhooks/delete.twig
@@ -9,7 +9,7 @@
         <div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12">
             <div class="box box-danger">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ trans('form.delete_webhook', {'title': webhook.title}) }}</h3>
+                    <h1 class="box-title">{{ trans('form.delete_webhook', {'title': webhook.title}) }}</h1>
                 </div>
                 <div class="box-body">
                     <p class="text-danger">