diff --git a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss b/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss
index abd924e9f4..6bdeb11918 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss
+++ b/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss
@@ -2843,7 +2843,7 @@ $star-selected: #EDB867;
 /* end browse search */
 
 /* Skip to content link. CSS adapted from https://webaim.org/ */
-#scrolltocontent {
+#scrolltocontent, #scrolltofooter, #scrolltomenu, #scrolltosearch {
     background: #C60000;
     border: 1px solid #FFF;
     border-radius: 0 0 4px 0;
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
index aceed71ef5..1283ae902b 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
@@ -18,7 +18,16 @@
 [% SET CookieConsentPopup = AdditionalContents.get( location => "CookieConsentPopup", lang => lang, library => branchcode || default_branch ) %]
 [% SET AllPublicBranches = Branches.all(  search_params => { public => 1 }, selected => opac_name, unfiltered => 1 ) %]
 
+[% UNLESS ( advsearch ) %]
+    <button id="scrolltosearch">Skip to search</button>
+[% END %]
+[% IF ( ( IsPatronPage && loggedinusername ) || opacfacets || IsMenuPage ) %]
+    <button id="scrolltomenu">Skip to menu</button>
+[% END %]
 <button id="scrolltocontent">Skip to main content</button>
+[% IF ( Koha.Preference('OPACReportProblem') && Koha.Preference('KohaAdminEmailAddress') ) || Koha.Preference( 'CookieConsent' ) || OpacKohaUrl || ( ( OpacLangSelectorMode == 'both' || OpacLangSelectorMode == 'footer') ) %]
+    <button id="scrolltofooter">Skip to footer</button>
+[% END %]
 <!-- prettier-ignore-start -->
 <!-- closed in opac-bottom.inc -->
 <div id="wrapper">
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
index d0ee3c8e80..490037a149 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
@@ -23,7 +23,7 @@
     <!-- prettier-ignore-end -->
 
     [% IF ( Koha.Preference('OPACReportProblem') && Koha.Preference('KohaAdminEmailAddress') ) || Koha.Preference( 'CookieConsent' ) || OpacKohaUrl || ( ( opaclanguagesdisplay ) && ( ! one_language_enabled ) && ( languages_loop ) && ( OpacLangSelectorMode == 'both' || OpacLangSelectorMode == 'footer') ) %]
-        <footer id="changelanguage" class="navbar navbar-expand navbar-light bg-light noprint">
+        <footer id="changelanguage" class="navbar navbar-expand navbar-light bg-light noprint footercontent">
             <div class="container-fluid">
                 <div class="collapse navbar-collapse">
                     [%# Following on one line for translatability %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc
index 03e74f148c..1b360360a1 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc
@@ -2,7 +2,7 @@
 [% USE Biblio %]
 [% INCLUDE 'modals/catalog_cite.inc' %]
 
-<ul id="action">
+<ul class="menu" id="action">
     [% IF Koha.Preference( 'opacuserlogin' ) == 1 %]
         [% IF Koha.Preference( 'OPACHoldRequests' ) == 1 %]
             [% IF ( ReservableItems ) %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc
index 36a26e8cad..8a2eaed199 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc
@@ -5,7 +5,7 @@
 [% USE AdditionalContents %]
 [% SET OPACResultsSidebar = AdditionalContents.get( location => "OPACResultsSidebar", lang => lang, library => logged_in_user.branchcode || default_branch ) %]
 [% IF ( opacfacets && facets_loop && total ) %]
-    <div id="search-facets">
+    <div class="menu" id="search-facets">
         <h2><a href="#" class="menu-collapse-toggle" aria-expanded="false">Refine your search</a></h2>
         <ul class="menu-collapse">
             [% IF Koha.Preference("SavedSearchFilters") && search_filters.size > 0 %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-topissues.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-topissues.inc
index e4917444d4..99225e53fd 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-topissues.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-topissues.inc
@@ -3,7 +3,7 @@
 [% PROCESS 'html_helpers.inc' %]
 [% SET AllPublicBranches = Branches.all(  search_params => { public => 1 }, selected => branch, unfiltered => 1 ) %]
 
-<div id="search-facets">
+<div class="menu" id="search-facets">
     <form method="get" action="/cgi-bin/koha/opac-topissues.pl">
         <h2><a href="#" class="menu-collapse-toggle" aria-expanded="false">Refine your search</a></h2>
         <ul class="menu-collapse">
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc
index 894b317dcc..bdd2b6e83f 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc
@@ -1,7 +1,7 @@
 [% USE Koha %]
 [% USE KohaPlugins %]
 [% IF ( ( Koha.Preference( 'opacuserlogin' ) == 1 ) && loggedinusername ) %]
-    <div id="menu">
+    <div class="menu" id="menu">
         <ul>
             <li [% IF userview %]class="active"[% END %]> <a href="/cgi-bin/koha/opac-user.pl">Summary</a></li>
 
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/errorpage.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/errorpage.tt
index 47f82c71dd..00770a7496 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/errorpage.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/errorpage.tt
@@ -37,7 +37,7 @@
                 </div>
             [% END %]
 
-            <div class="[% column_class | html %]">
+            <div class="[% column_class | html %] maincontent">
                 <div id="errormsg[% errno | html %]">
                     <h1>Sorry, the requested page is not available</h1>
                     <h2>Error [% errno | html %]</h2>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-ISBDdetail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-ISBDdetail.tt
index e3aeb0c8f8..91431ebd32 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-ISBDdetail.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-ISBDdetail.tt
@@ -14,7 +14,7 @@
 [% END %]
 </head>
 [% INCLUDE 'bodytag.inc' bodyid='opac-isbddetail' bodyclass='scrollto' %]
-[% INCLUDE 'masthead.inc' %]
+[% INCLUDE 'masthead.inc' IsMenuPage=1 %]
 <main class="main">
     [% WRAPPER breadcrumbs %]
         [% WRAPPER breadcrumb_item bc_active= 1 %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-MARCdetail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-MARCdetail.tt
index aecfb6d343..6dbb763cf8 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-MARCdetail.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-MARCdetail.tt
@@ -14,7 +14,7 @@
 [% END %]
 </head>
 [% INCLUDE 'bodytag.inc' bodyid='opac-marcdetail' bodyclass='scrollto' %]
-[% INCLUDE 'masthead.inc' %]
+[% INCLUDE 'masthead.inc' IsMenuPage=1 %]
 <main class="main">
     [% WRAPPER breadcrumbs %]
         [% WRAPPER breadcrumb_item bc_active= 1 %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt
index 85ca415f64..6adf9e5715 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt
@@ -24,7 +24,7 @@
 </head>
 
 [% INCLUDE 'bodytag.inc' bodyid='opac-account' bodyclass='scrollto' %]
-[% INCLUDE 'masthead.inc' %]
+[% INCLUDE 'masthead.inc' IsPatronPage=1 %]
 
 <main class="main">
     [% WRAPPER breadcrumbs %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-curbside-pickups.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-curbside-pickups.tt
index e2fab90844..ccf36d5bee 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-curbside-pickups.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-curbside-pickups.tt
@@ -95,7 +95,7 @@
 [% END %]
 </head>
 [% INCLUDE 'bodytag.inc' bodyid='opac-curside-pickups' bodyclass='scrollto' %]
-[% INCLUDE 'masthead.inc' %]
+[% INCLUDE 'masthead.inc' IsPatronPage=1 %]
 <main class="main">
     [% WRAPPER breadcrumbs %]
         [% WRAPPER breadcrumb_item %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
index a9502b0672..6c9079d588 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
@@ -61,7 +61,7 @@
 </head>
 [% BLOCK cssinclude %][% END %]
 [% INCLUDE 'bodytag.inc' bodyid='opac-detail' bodyclass='scrollto' %]
-[% INCLUDE 'masthead.inc' %]
+[% INCLUDE 'masthead.inc' IsMenuPage=1 %]
 
 [% SET hidden_columns_force = {} %]
 <main class="main">
@@ -1037,7 +1037,7 @@
             <!-- /.col-lg-10 -->
 
             <div class="col-lg-3">
-                <div id="ulactioncontainer">
+                <div class="menu" id="ulactioncontainer">
                     [% IF ( Koha.Preference('OpacBrowseResults') && busc ) %]
                         <div class="nav_results">
                             <div class="l_Results" style="display:none;">
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-discharge.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-discharge.tt
index c71335f363..b911dcdbd9 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-discharge.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-discharge.tt
@@ -18,7 +18,7 @@
 [% END %]
 </head>
 <body id="opac-discharge" class="scrollto">
-[% INCLUDE 'masthead.inc' %]
+[% INCLUDE 'masthead.inc' IsPatronPage=1 %]
 
 <main class="main">
     [% WRAPPER breadcrumbs %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-holdshistory.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-holdshistory.tt
index b39741c88b..811afd0ef0 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-holdshistory.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-holdshistory.tt
@@ -47,7 +47,7 @@
 [% END %]
 </head>
 [% INCLUDE 'bodytag.inc' bodyid='opac-holdshistory' %]
-[% INCLUDE 'masthead.inc' %]
+[% INCLUDE 'masthead.inc' IsPatronPage=1 %]
 
 <main class="main">
     [% WRAPPER breadcrumbs %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt
index 29fefb588f..d810c77b53 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt
@@ -28,7 +28,7 @@
         <div class="alert alert-success" role="alert">Request placed</div>
     [% END %]
 [% END %]
-[% INCLUDE 'masthead.inc' %]
+[% INCLUDE 'masthead.inc' IsPatronPage=1 %]
 <main class="main">
     [% WRAPPER breadcrumbs %]
         [% IF ( logged_in_user ) %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt
index 67de0d20a9..383c5056ea 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt
@@ -54,7 +54,7 @@
 [% ELSE %]
     <body id="opac-patron-registration" class="opac">
 [% END %]
-[% INCLUDE 'masthead.inc' %]
+[% INCLUDE 'masthead.inc' IsPatronPage=1 %]
 
 <main class="main">
     [% WRAPPER breadcrumbs %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt
index 481267ae6c..c85c529b9c 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt
@@ -17,7 +17,7 @@
 [% END %]
 </head>
 [% INCLUDE 'bodytag.inc' bodyid='opac-messaging' %]
-[% INCLUDE 'masthead.inc' %]
+[% INCLUDE 'masthead.inc' IsPatronPage=1 %]
 
 <main class="main">
     [% WRAPPER breadcrumbs %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt
index 0ff9f8ed03..20d588eaea 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt
@@ -18,7 +18,7 @@
 [% END %]
 </head>
 [% INCLUDE 'bodytag.inc' bodyid='opac-passwd' %]
-[% INCLUDE 'masthead.inc' %]
+[% INCLUDE 'masthead.inc' IsPatronPage=1 %]
 
 <main class="main">
     [% WRAPPER breadcrumbs %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-patron-consent.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-patron-consent.tt
index 84c0d837a5..2ce90d8028 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-patron-consent.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-patron-consent.tt
@@ -19,7 +19,7 @@
 [% END %]
 </head>
 [% INCLUDE 'bodytag.inc' bodyid='opac-patron-consent' %]
-[% INCLUDE 'masthead.inc' %]
+[% INCLUDE 'masthead.inc' IsPatronPage=1 %]
 
 <main class="main">
     [% WRAPPER breadcrumbs %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt
index c7ece53560..10fac3e839 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt
@@ -17,7 +17,7 @@
 [% END %]
 </head>
 [% INCLUDE 'bodytag.inc' bodyid='opac-privacy' %]
-[% INCLUDE 'masthead.inc' %]
+[% INCLUDE 'masthead.inc' IsPatronPage=1 %]
 
 <main class="main">
     [% WRAPPER breadcrumbs %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt
index d4ce9a2e44..fe4673c76f 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt
@@ -21,7 +21,7 @@
 [% END %]
 </head>
 [% INCLUDE 'bodytag.inc' bodyid='opac-readingrecord' %]
-[% INCLUDE 'masthead.inc' %]
+[% INCLUDE 'masthead.inc' IsPatronPage=1 %]
 
 [% IF Koha.Preference('AmazonAssocTag') %]
     [% AmazonAssocTag = '?tag=' _ Koha.Preference('AmazonAssocTag') %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt
index 8c767145e1..d7faa0386b 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt
@@ -19,7 +19,7 @@
 [% END %]
 </head>
 <body id="opac-recall" class="scrollto">
-[% INCLUDE 'masthead.inc' %]
+[% INCLUDE 'masthead.inc' IsPatronPage=1 %]
 
 <main class="main">
     [% WRAPPER breadcrumbs %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recalls.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recalls.tt
index fe930a9c42..13e205ca00 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recalls.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recalls.tt
@@ -15,7 +15,7 @@
 [% END %]
 </head>
 [% INCLUDE 'bodytag.inc' bodyid='opac-recalls' bodyclass='scrollto' %]
-[% INCLUDE 'masthead.inc' %]
+[% INCLUDE 'masthead.inc' IsPatronPage=1 %]
 <main class="main">
     [% WRAPPER breadcrumbs %]
         [% WRAPPER breadcrumb_item %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-routing-lists.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-routing-lists.tt
index e38bd51b86..c53c9de679 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-routing-lists.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-routing-lists.tt
@@ -20,7 +20,7 @@
 </head>
 
 [% INCLUDE 'bodytag.inc' bodyid='opac-account' bodyclass='scrollto' %]
-[% INCLUDE 'masthead.inc' %]
+[% INCLUDE 'masthead.inc' IsPatronPage=1 %]
 
 <main class="main">
     [% WRAPPER breadcrumbs %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt
index a478d21271..a8008fc3e9 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt
@@ -20,7 +20,7 @@
 [% END %]
 </head>
 [% INCLUDE 'bodytag.inc' bodyid='opac-search-history' bodyclass='scrollto' %]
-[% INCLUDE 'masthead.inc' %]
+[% INCLUDE 'masthead.inc' IsPatronPage=1 %]
 
 <main class="main">
     [% WRAPPER breadcrumbs %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
index 294f678086..51172432a5 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
@@ -104,7 +104,7 @@
     </li>
 [% END %]
 
-[% INCLUDE 'masthead.inc' %]
+[% INCLUDE 'masthead.inc' IsPatronPage=1 %]
 <main class="main">
     [% WRAPPER breadcrumbs %]
         [% IF ( loggedinusername ) %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt
index 02d7ccc196..308b00670e 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt
@@ -28,7 +28,7 @@
 [% END %]
 </head>
 [% IF ( loggedinusername ) %][% INCLUDE 'bodytag.inc' bodyid='opac-usersuggestions' bodyclass='scrollto' %][% ELSE %][% INCLUDE 'bodytag.inc' bodyid='opac-suggestions' bodyclass='scrollto' %][% END %]
-[% INCLUDE 'masthead.inc' %]
+[% INCLUDE 'masthead.inc' IsPatronPage=1 %]
 
 <main class="main">
     [% WRAPPER breadcrumbs %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt
index 5220bf6ea6..fd9a7fc209 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt
@@ -63,7 +63,7 @@
 [% END %]
 </head>
 [% IF ( loggedinusername ) %][% INCLUDE 'bodytag.inc' bodyid='opac-usertags' bodyclass='scrollto' %][% ELSE %][% INCLUDE 'bodytag.inc' bodyid='opac-tags' bodyclass='scrollto' %][% END %]
-[% INCLUDE 'masthead.inc' %]
+[% INCLUDE 'masthead.inc' IsPatronPage=1 %]
 
 <main class="main">
     [% WRAPPER breadcrumbs %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt
index c10d7989cb..89c80020b9 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt
@@ -46,7 +46,7 @@
 [% END %]
 </head>
 [% INCLUDE 'bodytag.inc' bodyid='opac-topissues' bodyclass='scrollto' %]
-[% INCLUDE 'masthead.inc' %]
+[% INCLUDE 'masthead.inc' IsMenuPage=1 %]
 
 <main class="main">
     [% WRAPPER breadcrumbs %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
index 34d6517d32..9dda0cfdda 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
@@ -33,7 +33,7 @@
 [% END %]
 </head>
 [% INCLUDE 'bodytag.inc' bodyid='opac-user' bodyclass='scrollto' %]
-[% INCLUDE 'masthead.inc' %]
+[% INCLUDE 'masthead.inc' IsPatronPage=1 %]
 
 [% IF Koha.Preference('AmazonAssocTag') %]
     [% AmazonAssocTag = '?tag=' _ Koha.Preference('AmazonAssocTag') %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-virtual-card.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-virtual-card.tt
index 5e235e3db9..c85c65dab5 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-virtual-card.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-virtual-card.tt
@@ -13,7 +13,7 @@
 [% END %]
 </head>
 [% INCLUDE 'bodytag.inc' bodyid='opac-virtual-card' %]
-[% INCLUDE 'masthead.inc' %]
+[% INCLUDE 'masthead.inc' IsPatronPage=1 %]
 
 <main class="main">
     [% WRAPPER breadcrumbs %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/js/global.js b/koha-tmpl/opac-tmpl/bootstrap/js/global.js
index 130d17b3a7..c6c76c2feb 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/js/global.js
+++ b/koha-tmpl/opac-tmpl/bootstrap/js/global.js
@@ -355,6 +355,45 @@ $(document).ready(function () {
         }
     });
 
+    $("#scrolltofooter").click(function () {
+        var content = $(".footercontent");
+        if (content.length > 0) {
+            $("html,body").animate(
+                {
+                    scrollTop: content.first().offset().top,
+                },
+                "slow"
+            );
+            content.first().find(":focusable").eq(0).focus();
+        }
+    });
+
+    $("#scrolltomenu").click(function () {
+        var content = $(".menu");
+        if (content.length > 0) {
+            $("html,body").animate(
+                {
+                    scrollTop: content.first().offset().top,
+                },
+                "slow"
+            );
+            content.first().find(":focusable").eq(0).focus();
+        }
+    });
+
+    $("#scrolltosearch").click(function () {
+        var content = $(".mastheadsearch");
+        if (content.length > 0) {
+            $("html,body").animate(
+                {
+                    scrollTop: content.first().offset().top,
+                },
+                "slow"
+            );
+            content.first().find(":focusable").eq(0).focus();
+        }
+    });
+
     if (typeof bootstrap == "object") {
         $('[data-bs-toggle="tooltip"]').tooltip();
     }