diff --git a/resources/assets/v2/src/sass/app.scss b/resources/assets/v2/src/sass/app.scss
index 872e5bda2d6..9f848a3396d 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;
+    top: -40px;
+    left: 6px;
+    background: #000;
+    color: #fff;
+    padding: 8px;
+    text-decoration: none;
+    z-index: 1000;
+}
+
+.skip-links:focus {
+    top: 6px;
+}
 
 /*
 Remove bottom margin from unstyled lists
diff --git a/resources/views/install/index.blade.php b/resources/views/install/index.blade.php
index 5b2de35b596..f070d13319f 100644
--- a/resources/views/install/index.blade.php
+++ b/resources/views/install/index.blade.php
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="{{ trans('config.html_language') }}">
 <head>
     <base href="{{ route('index') }}/"/>
     <meta charset="utf-8">
diff --git a/resources/views/layout/default.twig b/resources/views/layout/default.twig
index a20ed1b0600..87d63734680 100644
--- a/resources/views/layout/default.twig
+++ b/resources/views/layout/default.twig
@@ -94,8 +94,10 @@
 </head>
 <body class="skin-firefly-iii sidebar-mini hold-transition">
 <div class="wrapper" id="app">
+    <a href="#main-content" class="skip-links">{{ 'skip_to_content'|_ }}</a>
+    <a href="#main-navigation" class="skip-links">{{ 'skip_to_navigation'|_ }}</a>
 
-    <header class="main-header">
+    <header class="main-header" role="banner">
 
         {# Logo #}
         <a href="{{ route('index') }}" class="logo">
@@ -139,7 +141,7 @@
 
         </nav>
     </header>
-    <aside class="main-sidebar">
+    <aside class="main-sidebar" role="navigation" aria-label="{{ 'main_navigation'|_ }}" id="main-navigation">
         <section class="sidebar">
             <form action="{{ route('search.index') }}" method="get" class="sidebar-form">
                 <div class="input-group">
@@ -160,21 +162,23 @@
             {% block breadcrumbs %}{% endblock %}
         </section>
 
-        <section class="content">
-            {% if IS_DEMO_SITE %}
-                <div class="row no-print">
-                    <div class="col-lg-12">
-                        <p class="well">
-                            {% include ['demo.' ~ Route.getCurrentRoute.getName, 'demo.no-demo-text'] %}
-                        </p>
+        <main role="main" aria-label="{{ 'main_content'|_ }}" id="main-content">
+            <section class="content">
+                {% if IS_DEMO_SITE %}
+                    <div class="row no-print">
+                        <div class="col-lg-12">
+                            <p class="well">
+                                {% include ['demo.' ~ Route.getCurrentRoute.getName, 'demo.no-demo-text'] %}
+                            </p>
+                        </div>
                     </div>
-                </div>
-            {% endif %}
+                {% endif %}
 
-            {% include('partials.flashes') %}
+                {% include('partials.flashes') %}
 
-            {% block content %}{% endblock %}
-        </section>
+                {% block content %}{% endblock %}
+            </section>
+        </main>
     </div>
     <footer class="main-footer">
         <div class="pull-right">
diff --git a/resources/views/layout/empty.twig b/resources/views/layout/empty.twig
index 444a3369718..1f53b5173e3 100644
--- a/resources/views/layout/empty.twig
+++ b/resources/views/layout/empty.twig
@@ -4,7 +4,7 @@
     <base href="{{ route('index') }}/">
     <meta charset="UTF-8">
     <meta name="robots" content="noindex, nofollow, noarchive, noodp, NoImageIndex, noydir">
-    <title>Firefly III</title>
+    <title>{% block title %}Firefly III{% endblock %} - {{ page_description|default('Personal Finance Manager') }}</title>
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="csrf-token" content="{{ csrf_token() }}">
     <meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
diff --git a/resources/views/layout/install.twig b/resources/views/layout/install.twig
index 29e7bc88a89..87fd4bd6f82 100644
--- a/resources/views/layout/install.twig
+++ b/resources/views/layout/install.twig
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="{{ trans('config.html_language') }}">
 <head>
     <title>Firefly III - Installation and update</title>
     <base href="{{ route('index') }}/">
diff --git a/resources/views/layout/v2/error.blade.php b/resources/views/layout/v2/error.blade.php
index 7c1a5967b0c..636699ac58c 100644
--- a/resources/views/layout/v2/error.blade.php
+++ b/resources/views/layout/v2/error.blade.php
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="{{ trans('config.html_language') }}">
 <head>
     <base href="{{ route('index') }}/"/>
     <meta charset="utf-8">
diff --git a/resources/views/layout/v2/session.blade.php b/resources/views/layout/v2/session.blade.php
index 4079179d835..63589f972d5 100644
--- a/resources/views/layout/v2/session.blade.php
+++ b/resources/views/layout/v2/session.blade.php
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="{{ trans('config.html_language') }}">
 <head>
     <base href="{{ route('index') }}/" />
     <meta charset="utf-8">
diff --git a/resources/views/layout/v3/session.twig b/resources/views/layout/v3/session.twig
index 33d893678ec..b7b67f91a20 100644
--- a/resources/views/layout/v3/session.twig
+++ b/resources/views/layout/v3/session.twig
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="{{ trans('config.html_language') }}">
 <head>
     <meta charset="utf-8">
     <base href="{{ route('index') }}/" />
diff --git a/resources/views/partials/menu-sidebar.twig b/resources/views/partials/menu-sidebar.twig
index 5b262fc05d0..385fb1cfb6b 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" role="menubar" aria-label="{{ 'main_navigation'|_ }}">
     <li class="{{ activeRouteStrict('index') }}">
         <a href="{{ route('index') }}">
             <em class="fa fa-dashboard fa-fw"></em>
diff --git a/resources/views/v2/layout/v2.blade.php b/resources/views/v2/layout/v2.blade.php
index 43796d2d1fc..5de4b53128c 100644
--- a/resources/views/v2/layout/v2.blade.php
+++ b/resources/views/v2/layout/v2.blade.php
@@ -9,8 +9,10 @@
 <body class="layout-fixed sidebar-expand-lg bg-body-tertiary">
 <!--begin::App Wrapper-->
 <div class="app-wrapper">
+    <a href="#main-content" class="skip-links">{{ __('firefly.skip_to_content') }}</a>
+    <a href="#main-navigation" class="skip-links">{{ __('firefly.skip_to_navigation') }}</a>
     <!--begin::Header-->
-    <nav class="app-header navbar navbar-expand bg-body">
+    <nav class="app-header navbar navbar-expand bg-body" role="banner" aria-label="{{ __('firefly.main_navigation') }}">
         <!--begin::Container-->
         <div class="container-fluid">
             <!--begin::Start Navbar Links-->
@@ -97,7 +99,7 @@
     @include('partials.layout.sidebar')
     <!--end::Sidebar-->
     <!--begin::App Main-->
-    <main class="app-main">
+    <main class="app-main" role="main" aria-label="{{ __('firefly.main_content') }}" id="main-content">
         <!--begin::App Content Header-->
         <div class="app-content-header">
             <!--begin::Container-->
diff --git a/resources/views/v2/partials/layout/sidebar.blade.php b/resources/views/v2/partials/layout/sidebar.blade.php
index ac6f54c4583..3caca89f218 100644
--- a/resources/views/v2/partials/layout/sidebar.blade.php
+++ b/resources/views/v2/partials/layout/sidebar.blade.php
@@ -1,4 +1,4 @@
-<aside class="app-sidebar bg-body-secondary shadow" data-bs-theme="dark">
+<aside class="app-sidebar bg-body-secondary shadow" data-bs-theme="dark" role="navigation" aria-label="{{ __('firefly.main_navigation') }}" id="main-navigation">
     <!--begin::Sidebar Brand-->
     <div class="sidebar-brand">
         <!--begin::Brand Link-->
@@ -19,8 +19,8 @@ class="brand-image opacity-75 shadow">
     <div class="sidebar-wrapper">
         <nav class="mt-2">
             <!--begin::Sidebar Menu-->
-            <ul class="nav sidebar-menu flex-column" data-lte-toggle="treeview" role="menu"
-                data-accordion="false">
+            <ul class="nav sidebar-menu flex-column" data-lte-toggle="treeview" role="menubar"
+                data-accordion="false" aria-label="{{ __('firefly.main_navigation') }}">
                 <li class="nav-item menu-open">
                     <a href="{{ route('index') }}" class="nav-link active">
                         <em class="nav-icon fa-solid fa-gauge-high"></em>
diff --git a/resources/views/vendor/passport/authorize.twig b/resources/views/vendor/passport/authorize.twig
index f11f627c917..85f9e35e021 100644
--- a/resources/views/vendor/passport/authorize.twig
+++ b/resources/views/vendor/passport/authorize.twig
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="{{ trans('config.html_language') }}">
 <head>
     <base href="{{ route('index') }}/">
     <meta charset="utf-8">
