diff --git a/src/implementations/twig/components/file/__snapshots__/file.test.js.snap b/src/implementations/twig/components/file/__snapshots__/file.test.js.snap
index 1e05085ebe6..e00c7cb3dc0 100644
--- a/src/implementations/twig/components/file/__snapshots__/file.test.js.snap
+++ b/src/implementations/twig/components/file/__snapshots__/file.test.js.snap
@@ -75,6 +75,7 @@ exports[`File Thumbnail renders correctly 1`] = `
         </div>
       </div>
       <a
+        aria-label="Download file State of the Union 2018 brochure"
         class="ecl-link ecl-link--standalone ecl-link--icon ecl-link--icon-after ecl-file__download"
         href="/example"
       >
@@ -388,6 +389,7 @@ exports[`File Thumbnail renders correctly with deprecated data 1`] = `
         </div>
       </div>
       <a
+        aria-label="Download file State of the Union 2018 brochure"
         class="ecl-link ecl-link--standalone ecl-link--icon ecl-link--icon-after ecl-file__download"
         href="/example"
       >
@@ -733,6 +735,7 @@ exports[`File Thumbnail renders correctly with taxonomies 1`] = `
         </div>
       </div>
       <a
+        aria-label="Download file State of the Union 2018 brochure"
         class="ecl-link ecl-link--standalone ecl-link--icon ecl-link--icon-after ecl-file__download"
         href="/example"
       >
@@ -1037,6 +1040,7 @@ exports[`File Thumbnail renders correctly without an image 1`] = `
         </div>
       </div>
       <a
+        aria-label="Download file State of the Union 2018 brochure"
         class="ecl-link ecl-link--standalone ecl-link--icon ecl-link--icon-after ecl-file__download"
         href="/example"
       >
@@ -1314,6 +1318,7 @@ exports[`File With translation renders correctly 1`] = `
         </div>
       </div>
       <a
+        aria-label="Download file State of the Union 2018 brochure"
         class="ecl-link ecl-link--standalone ecl-link--icon ecl-link--icon-after ecl-file__download"
         href="/example"
       >
@@ -1548,6 +1553,7 @@ exports[`File With translation renders correctly with extra attributes 1`] = `
         </div>
       </div>
       <a
+        aria-label="Download file State of the Union 2018 brochure"
         class="ecl-link ecl-link--standalone ecl-link--icon ecl-link--icon-after ecl-file__download"
         href="/example"
       >
@@ -1780,6 +1786,7 @@ exports[`File With translation renders correctly with extra class names 1`] = `
         </div>
       </div>
       <a
+        aria-label="Download file State of the Union 2018 brochure"
         class="ecl-link ecl-link--standalone ecl-link--icon ecl-link--icon-after ecl-file__download"
         href="/example"
       >
@@ -2025,6 +2032,7 @@ exports[`File Without translation renders correctly 1`] = `
         </div>
       </div>
       <a
+        aria-label="Download file State of the Union 2018 brochure"
         class="ecl-link ecl-link--standalone ecl-link--icon ecl-link--icon-after ecl-file__download"
         href="/example"
       >
@@ -2109,6 +2117,7 @@ exports[`File Without translation renders correctly with a single label 1`] = `
         </div>
       </div>
       <a
+        aria-label="Download file State of the Union 2018 brochure"
         class="ecl-link ecl-link--standalone ecl-link--icon ecl-link--icon-after ecl-file__download"
         href="/example"
       >
@@ -2186,6 +2195,7 @@ exports[`File Without translation renders correctly with extra attributes 1`] =
         </div>
       </div>
       <a
+        aria-label="Download file State of the Union 2018 brochure"
         class="ecl-link ecl-link--standalone ecl-link--icon ecl-link--icon-after ecl-file__download"
         href="/example"
       >
@@ -2261,6 +2271,7 @@ exports[`File Without translation renders correctly with extra class names 1`] =
         </div>
       </div>
       <a
+        aria-label="Download file State of the Union 2018 brochure"
         class="ecl-link ecl-link--standalone ecl-link--icon ecl-link--icon-after ecl-file__download"
         href="/example"
       >
@@ -2354,6 +2365,7 @@ exports[`File Without translation renders correctly with multiple labels 1`] = `
         </div>
       </div>
       <a
+        aria-label="Download file State of the Union 2018 brochure"
         class="ecl-link ecl-link--standalone ecl-link--icon ecl-link--icon-after ecl-file__download"
         href="/example"
       >
diff --git a/src/implementations/twig/components/menu/__snapshots__/menu.test.js.snap b/src/implementations/twig/components/menu/__snapshots__/menu.test.js.snap
index 4a9cb1e7c8d..b1e15d7481e 100644
--- a/src/implementations/twig/components/menu/__snapshots__/menu.test.js.snap
+++ b/src/implementations/twig/components/menu/__snapshots__/menu.test.js.snap
@@ -8,6 +8,7 @@ exports[`Menu Default renders correctly 1`] = `
     data-ecl-auto-init="Menu"
     data-ecl-menu=""
     data-ecl-menu-max-lines="2"
+    role="navigation"
   >
     <div
       class="ecl-menu__overlay"
@@ -847,6 +848,7 @@ exports[`Menu Default renders correctly with extra attributes 1`] = `
     data-ecl-menu-max-lines="2"
     data-test="data-test-value"
     data-test-1="data-test-value-1"
+    role="navigation"
   >
     <div
       class="ecl-menu__overlay"
@@ -1684,6 +1686,7 @@ exports[`Menu Default renders correctly with extra class names 1`] = `
     data-ecl-auto-init="Menu"
     data-ecl-menu=""
     data-ecl-menu-max-lines="2"
+    role="navigation"
   >
     <div
       class="ecl-menu__overlay"
@@ -2521,6 +2524,7 @@ exports[`Menu Translated renders correctly 1`] = `
     data-ecl-auto-init="Menu"
     data-ecl-menu=""
     data-ecl-menu-max-lines="2"
+    role="navigation"
   >
     <div
       class="ecl-menu__overlay"
diff --git a/src/implementations/twig/components/menu/menu.html.twig b/src/implementations/twig/components/menu/menu.html.twig
index 9483f211772..66fa619ae82 100644
--- a/src/implementations/twig/components/menu/menu.html.twig
+++ b/src/implementations/twig/components/menu/menu.html.twig
@@ -70,6 +70,7 @@
   data-ecl-menu-max-lines="{{ _max_lines }}"
   data-ecl-auto-init="Menu"
   aria-expanded="false"
+  role="navigation"
   {{ _extra_attributes|raw }}
 >
   <div class="ecl-menu__overlay" data-ecl-menu-overlay></div>
diff --git a/src/implementations/twig/components/site-header/__snapshots__/site-header.test.js.snap b/src/implementations/twig/components/site-header/__snapshots__/site-header.test.js.snap
index dfb345a43af..e07414a79a3 100644
--- a/src/implementations/twig/components/site-header/__snapshots__/site-header.test.js.snap
+++ b/src/implementations/twig/components/site-header/__snapshots__/site-header.test.js.snap
@@ -988,6 +988,7 @@ exports[`Site Header EC renders correctly 1`] = `
             </div>
             <div
               class="ecl-site-header__search-container"
+              role="search"
             >
               <a
                 aria-controls="search-form-id"
@@ -2195,6 +2196,7 @@ exports[`Site Header EC renders correctly when logged in 1`] = `
             </div>
             <div
               class="ecl-site-header__search-container"
+              role="search"
             >
               <a
                 aria-controls="search-form-id"
@@ -3372,6 +3374,7 @@ exports[`Site Header EC renders correctly with extra attributes 1`] = `
             </div>
             <div
               class="ecl-site-header__search-container"
+              role="search"
             >
               <a
                 aria-controls="search-form-id"
@@ -4547,6 +4550,7 @@ exports[`Site Header EC renders correctly with extra class names 1`] = `
             </div>
             <div
               class="ecl-site-header__search-container"
+              role="search"
             >
               <a
                 aria-controls="search-form-id"
@@ -5722,6 +5726,7 @@ exports[`Site Header EU renders correctly 1`] = `
             </div>
             <div
               class="ecl-site-header__search-container"
+              role="search"
             >
               <a
                 aria-controls="search-form-id"
diff --git a/src/implementations/twig/components/site-header/site-header.html.twig b/src/implementations/twig/components/site-header/site-header.html.twig
index e63b38e5792..fda925c6183 100644
--- a/src/implementations/twig/components/site-header/site-header.html.twig
+++ b/src/implementations/twig/components/site-header/site-header.html.twig
@@ -316,7 +316,7 @@
 
         {# Search form #}
         {% if _search_form is defined %}
-          <div class="ecl-site-header__search-container">
+          <div class="ecl-site-header__search-container" role="search">
           {% if _search_toggle is not empty %}
             <a
               class="ecl-button ecl-button--ghost ecl-site-header__search-toggle"
diff --git a/src/implementations/twig/deprecated/site-header-core/__snapshots__/site-header-core.test.js.snap b/src/implementations/twig/deprecated/site-header-core/__snapshots__/site-header-core.test.js.snap
index 9328493365e..968ceab670e 100644
--- a/src/implementations/twig/deprecated/site-header-core/__snapshots__/site-header-core.test.js.snap
+++ b/src/implementations/twig/deprecated/site-header-core/__snapshots__/site-header-core.test.js.snap
@@ -160,6 +160,7 @@ exports[`EC Site Header Core Default renders correctly 1`] = `
       data-ecl-auto-init="Menu"
       data-ecl-menu=""
       data-ecl-menu-max-lines="2"
+      role="navigation"
     >
       <div
         class="ecl-menu__overlay"
@@ -1684,6 +1685,7 @@ exports[`EC Site Header Core Default renders correctly when logged in 1`] = `
       data-ecl-auto-init="Menu"
       data-ecl-menu=""
       data-ecl-menu-max-lines="2"
+      role="navigation"
     >
       <div
         class="ecl-menu__overlay"
@@ -3178,6 +3180,7 @@ exports[`EC Site Header Core Default renders correctly with extra attributes 1`]
       data-ecl-auto-init="Menu"
       data-ecl-menu=""
       data-ecl-menu-max-lines="2"
+      role="navigation"
     >
       <div
         class="ecl-menu__overlay"
@@ -4670,6 +4673,7 @@ exports[`EC Site Header Core Default renders correctly with extra class names 1`
       data-ecl-auto-init="Menu"
       data-ecl-menu=""
       data-ecl-menu-max-lines="2"
+      role="navigation"
     >
       <div
         class="ecl-menu__overlay"
@@ -6162,6 +6166,7 @@ exports[`EC Site Header Core Translated renders correctly 1`] = `
       data-ecl-auto-init="Menu"
       data-ecl-menu=""
       data-ecl-menu-max-lines="2"
+      role="navigation"
     >
       <div
         class="ecl-menu__overlay"
@@ -8012,6 +8017,7 @@ exports[`EC Site Header Core Translated renders correctly with extra attributes
       data-ecl-auto-init="Menu"
       data-ecl-menu=""
       data-ecl-menu-max-lines="2"
+      role="navigation"
     >
       <div
         class="ecl-menu__overlay"
@@ -9860,6 +9866,7 @@ exports[`EC Site Header Core Translated renders correctly with extra class names
       data-ecl-auto-init="Menu"
       data-ecl-menu=""
       data-ecl-menu-max-lines="2"
+      role="navigation"
     >
       <div
         class="ecl-menu__overlay"
@@ -11708,6 +11715,7 @@ exports[`EU Site Header Core Default renders correctly 1`] = `
       data-ecl-auto-init="Menu"
       data-ecl-menu=""
       data-ecl-menu-max-lines="2"
+      role="navigation"
     >
       <div
         class="ecl-menu__overlay"
@@ -13232,6 +13240,7 @@ exports[`EU Site Header Core Default renders correctly when logged in 1`] = `
       data-ecl-auto-init="Menu"
       data-ecl-menu=""
       data-ecl-menu-max-lines="2"
+      role="navigation"
     >
       <div
         class="ecl-menu__overlay"
@@ -14726,6 +14735,7 @@ exports[`EU Site Header Core Default renders correctly with extra attributes 1`]
       data-ecl-auto-init="Menu"
       data-ecl-menu=""
       data-ecl-menu-max-lines="2"
+      role="navigation"
     >
       <div
         class="ecl-menu__overlay"
@@ -16218,6 +16228,7 @@ exports[`EU Site Header Core Default renders correctly with extra class names 1`
       data-ecl-auto-init="Menu"
       data-ecl-menu=""
       data-ecl-menu-max-lines="2"
+      role="navigation"
     >
       <div
         class="ecl-menu__overlay"
@@ -17710,6 +17721,7 @@ exports[`EU Site Header Core Translated renders correctly 1`] = `
       data-ecl-auto-init="Menu"
       data-ecl-menu=""
       data-ecl-menu-max-lines="2"
+      role="navigation"
     >
       <div
         class="ecl-menu__overlay"
@@ -19560,6 +19572,7 @@ exports[`EU Site Header Core Translated renders correctly with extra attributes
       data-ecl-auto-init="Menu"
       data-ecl-menu=""
       data-ecl-menu-max-lines="2"
+      role="navigation"
     >
       <div
         class="ecl-menu__overlay"
@@ -21408,6 +21421,7 @@ exports[`EU Site Header Core Translated renders correctly with extra class names
       data-ecl-auto-init="Menu"
       data-ecl-menu=""
       data-ecl-menu-max-lines="2"
+      role="navigation"
     >
       <div
         class="ecl-menu__overlay"
diff --git a/src/implementations/twig/deprecated/site-header-harmonised/__snapshots__/site-header-harmonised.test.js.snap b/src/implementations/twig/deprecated/site-header-harmonised/__snapshots__/site-header-harmonised.test.js.snap
index b1fc755bece..88da2dce7dc 100644
--- a/src/implementations/twig/deprecated/site-header-harmonised/__snapshots__/site-header-harmonised.test.js.snap
+++ b/src/implementations/twig/deprecated/site-header-harmonised/__snapshots__/site-header-harmonised.test.js.snap
@@ -213,6 +213,7 @@ exports[`Site Header Harmonised Group 1 renders correctly 1`] = `
       data-ecl-auto-init="Menu"
       data-ecl-menu=""
       data-ecl-menu-max-lines="2"
+      role="navigation"
     >
       <div
         class="ecl-menu__overlay"
@@ -2073,6 +2074,7 @@ exports[`Site Header Harmonised Group 1 renders correctly when logged in 1`] = `
       data-ecl-auto-init="Menu"
       data-ecl-menu=""
       data-ecl-menu-max-lines="2"
+      role="navigation"
     >
       <div
         class="ecl-menu__overlay"
@@ -3935,6 +3937,7 @@ exports[`Site Header Harmonised Group 1 renders correctly with extra attributes
       data-ecl-auto-init="Menu"
       data-ecl-menu=""
       data-ecl-menu-max-lines="2"
+      role="navigation"
     >
       <div
         class="ecl-menu__overlay"
@@ -5795,6 +5798,7 @@ exports[`Site Header Harmonised Group 1 renders correctly with extra class names
       data-ecl-auto-init="Menu"
       data-ecl-menu=""
       data-ecl-menu-max-lines="2"
+      role="navigation"
     >
       <div
         class="ecl-menu__overlay"
@@ -7580,6 +7584,7 @@ exports[`Site Header Harmonised Group 2 renders correctly 1`] = `
       data-ecl-auto-init="Menu"
       data-ecl-menu=""
       data-ecl-menu-max-lines="2"
+      role="navigation"
     >
       <div
         class="ecl-menu__overlay"
@@ -9367,6 +9372,7 @@ exports[`Site Header Harmonised Group 2 renders correctly with extra attributes
       data-ecl-auto-init="Menu"
       data-ecl-menu=""
       data-ecl-menu-max-lines="2"
+      role="navigation"
     >
       <div
         class="ecl-menu__overlay"
@@ -11152,6 +11158,7 @@ exports[`Site Header Harmonised Group 2 renders correctly with extra class names
       data-ecl-auto-init="Menu"
       data-ecl-menu=""
       data-ecl-menu-max-lines="2"
+      role="navigation"
     >
       <div
         class="ecl-menu__overlay"
diff --git a/src/implementations/twig/deprecated/site-header-standardised/__snapshots__/site-header-standardised.test.js.snap b/src/implementations/twig/deprecated/site-header-standardised/__snapshots__/site-header-standardised.test.js.snap
index 0ebb24b00f0..d82c1dee4fc 100644
--- a/src/implementations/twig/deprecated/site-header-standardised/__snapshots__/site-header-standardised.test.js.snap
+++ b/src/implementations/twig/deprecated/site-header-standardised/__snapshots__/site-header-standardised.test.js.snap
@@ -210,6 +210,7 @@ exports[`EC Site Header Standardised Default renders correctly 1`] = `
       data-ecl-auto-init="Menu"
       data-ecl-menu=""
       data-ecl-menu-max-lines="2"
+      role="navigation"
     >
       <div
         class="ecl-menu__overlay"
@@ -1784,6 +1785,7 @@ exports[`EC Site Header Standardised Default renders correctly when logged in 1`
       data-ecl-auto-init="Menu"
       data-ecl-menu=""
       data-ecl-menu-max-lines="2"
+      role="navigation"
     >
       <div
         class="ecl-menu__overlay"
@@ -3328,6 +3330,7 @@ exports[`EC Site Header Standardised Default renders correctly with extra attrib
       data-ecl-auto-init="Menu"
       data-ecl-menu=""
       data-ecl-menu-max-lines="2"
+      role="navigation"
     >
       <div
         class="ecl-menu__overlay"
@@ -4870,6 +4873,7 @@ exports[`EC Site Header Standardised Default renders correctly with extra class
       data-ecl-auto-init="Menu"
       data-ecl-menu=""
       data-ecl-menu-max-lines="2"
+      role="navigation"
     >
       <div
         class="ecl-menu__overlay"
@@ -6412,6 +6416,7 @@ exports[`EC Site Header Standardised Translated renders correctly 1`] = `
       data-ecl-auto-init="Menu"
       data-ecl-menu=""
       data-ecl-menu-max-lines="2"
+      role="navigation"
     >
       <div
         class="ecl-menu__overlay"
@@ -8312,6 +8317,7 @@ exports[`EC Site Header Standardised Translated renders correctly with extra att
       data-ecl-auto-init="Menu"
       data-ecl-menu=""
       data-ecl-menu-max-lines="2"
+      role="navigation"
     >
       <div
         class="ecl-menu__overlay"
@@ -10210,6 +10216,7 @@ exports[`EC Site Header Standardised Translated renders correctly with extra cla
       data-ecl-auto-init="Menu"
       data-ecl-menu=""
       data-ecl-menu-max-lines="2"
+      role="navigation"
     >
       <div
         class="ecl-menu__overlay"
@@ -12108,6 +12115,7 @@ exports[`EU Site Header Standardised Default renders correctly 1`] = `
       data-ecl-auto-init="Menu"
       data-ecl-menu=""
       data-ecl-menu-max-lines="2"
+      role="navigation"
     >
       <div
         class="ecl-menu__overlay"
@@ -13682,6 +13690,7 @@ exports[`EU Site Header Standardised Default renders correctly when logged in 1`
       data-ecl-auto-init="Menu"
       data-ecl-menu=""
       data-ecl-menu-max-lines="2"
+      role="navigation"
     >
       <div
         class="ecl-menu__overlay"
@@ -15226,6 +15235,7 @@ exports[`EU Site Header Standardised Default renders correctly with extra attrib
       data-ecl-auto-init="Menu"
       data-ecl-menu=""
       data-ecl-menu-max-lines="2"
+      role="navigation"
     >
       <div
         class="ecl-menu__overlay"
@@ -16768,6 +16778,7 @@ exports[`EU Site Header Standardised Default renders correctly with extra class
       data-ecl-auto-init="Menu"
       data-ecl-menu=""
       data-ecl-menu-max-lines="2"
+      role="navigation"
     >
       <div
         class="ecl-menu__overlay"
@@ -18310,6 +18321,7 @@ exports[`EU Site Header Standardised Translated renders correctly 1`] = `
       data-ecl-auto-init="Menu"
       data-ecl-menu=""
       data-ecl-menu-max-lines="2"
+      role="navigation"
     >
       <div
         class="ecl-menu__overlay"
@@ -20210,6 +20222,7 @@ exports[`EU Site Header Standardised Translated renders correctly with extra att
       data-ecl-auto-init="Menu"
       data-ecl-menu=""
       data-ecl-menu-max-lines="2"
+      role="navigation"
     >
       <div
         class="ecl-menu__overlay"
@@ -22108,6 +22121,7 @@ exports[`EU Site Header Standardised Translated renders correctly with extra cla
       data-ecl-auto-init="Menu"
       data-ecl-menu=""
       data-ecl-menu-max-lines="2"
+      role="navigation"
     >
       <div
         class="ecl-menu__overlay"
diff --git a/src/specs/components/file/demo/data--taxonomy.js b/src/specs/components/file/demo/data--taxonomy.js
index bf0ec1529d1..dd0e3de105a 100644
--- a/src/specs/components/file/demo/data--taxonomy.js
+++ b/src/specs/components/file/demo/data--taxonomy.js
@@ -5,7 +5,6 @@ module.exports = {
   detail_meta: ['Resource type', 'Publication date'],
   variant: 'thumbnail',
   title: 'State of the Union 2018 brochure',
-  aria_label: 'Download file State of the Union 2018 brochure',
   description:
     'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer quis lorem tellus. Nullam sollicitudin suscipit diam, ac blandit ipsum tempor consectetur. Duis vitae pulvinar turpis. Donec maximus pharetra ex a ultricies.',
   image: {
@@ -23,6 +22,7 @@ module.exports = {
     link: {
       label: 'Download',
       path: exampleLink,
+      aria_label: 'Download file State of the Union 2018 brochure',
     },
     icon: {
       path: '/icons.svg',
diff --git a/src/specs/components/file/demo/data--thumbnail.js b/src/specs/components/file/demo/data--thumbnail.js
index 2888a2e5aa0..1b7d35fb097 100644
--- a/src/specs/components/file/demo/data--thumbnail.js
+++ b/src/specs/components/file/demo/data--thumbnail.js
@@ -5,7 +5,6 @@ module.exports = {
   detail_meta: ['Resource type', 'Publication date'],
   variant: 'thumbnail',
   title: 'State of the Union 2018 brochure',
-  aria_label: 'Download file State of the Union 2018 brochure',
   description:
     'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer quis lorem tellus. Nullam sollicitudin suscipit diam, ac blandit ipsum tempor consectetur. Duis vitae pulvinar turpis. Donec maximus pharetra ex a ultricies.',
   picture: {
@@ -29,6 +28,7 @@ module.exports = {
     link: {
       label: 'Download',
       path: exampleLink,
+      aria_label: 'Download file State of the Union 2018 brochure',
     },
     icon: {
       path: '/icons.svg',
diff --git a/src/specs/components/file/demo/data--with-translation.js b/src/specs/components/file/demo/data--with-translation.js
index e46a99b3505..b3448a93a22 100644
--- a/src/specs/components/file/demo/data--with-translation.js
+++ b/src/specs/components/file/demo/data--with-translation.js
@@ -3,7 +3,6 @@ const exampleLink = `${publicUrl}/example`;
 
 module.exports = {
   title: 'State of the Union 2018 brochure',
-  aria_label: 'Download file State of the Union 2018 brochure',
   language: 'English',
   meta: '(16.2 MB - PDF)',
   icon: {
@@ -15,6 +14,7 @@ module.exports = {
     link: {
       label: 'Download',
       path: exampleLink,
+      aria_label: 'Download file State of the Union 2018 brochure',
     },
     icon: {
       path: '/icons.svg',
diff --git a/src/specs/components/file/demo/data--without-translation.js b/src/specs/components/file/demo/data--without-translation.js
index 8d8e68a1a18..52ae830b98f 100644
--- a/src/specs/components/file/demo/data--without-translation.js
+++ b/src/specs/components/file/demo/data--without-translation.js
@@ -3,7 +3,6 @@ const exampleLink = `${publicUrl}/example`;
 
 module.exports = {
   title: 'State of the Union 2018 brochure',
-  aria_label: 'Download file State of the Union 2018 brochure',
   detail_meta: ['Resource type', 'Publication date'],
   language: 'English',
   meta: '(16.2 MB - PDF)',
@@ -16,6 +15,7 @@ module.exports = {
     link: {
       label: 'Download',
       path: exampleLink,
+      aria_label: 'Download file State of the Union 2018 brochure',
     },
     icon: {
       path: '/icons.svg',