diff --git a/docs/assets/javascripts/docs-theme.js b/docs/assets/javascripts/docs-theme.js
index bca89dd5f2..d4fbdefb9f 100644
--- a/docs/assets/javascripts/docs-theme.js
+++ b/docs/assets/javascripts/docs-theme.js
@@ -158,9 +158,24 @@ function initializeDocsTheme() {
 
             if (drawerToggle.checked) {
                 window.setTimeout(function () {
-                    var firstLink = drawer.querySelector(".md-nav__list a[href]");
+                    // With navigation.tabs, every tab's subtree stays mounted in the
+                    // drawer (Material slides the active one into view instead of
+                    // removing the rest). Opening the drawer reliably leaves
+                    // .md-sidebar__scrollwrap scrolled one panel-width to the right,
+                    // hiding the active tab's own list off-screen. Force it back to
+                    // the resting position before moving focus.
+                    const scrollwrap = drawer.querySelector(".md-sidebar__scrollwrap");
+                    if (scrollwrap) {
+                        scrollwrap.scrollLeft = 0;
+                    }
+
+                    // The first link in document order can belong to a tab that
+                    // isn't currently visible; focusing it without a scoped lookup
+                    // would re-trigger the same off-screen scroll. Prefer the
+                    // active tab's first link, and pass preventScroll as a backstop.
+                    const firstLink = drawer.querySelector(".md-nav__item--active > .md-nav .md-nav__list a[href]") || drawer.querySelector(".md-nav__list a[href]");
                     if (firstLink) {
-                        firstLink.focus();
+                        firstLink.focus({ preventScroll: true });
                     }
                 }, 0);
             } else {
diff --git a/docs/release-notes/index.md b/docs/release-notes/index.md
index f50832d941..aba676dcd3 100644
--- a/docs/release-notes/index.md
+++ b/docs/release-notes/index.md
@@ -2,6 +2,7 @@
 rss_title: Codacy release notes RSS feed
 rss_href: /feed_rss_created.xml
 description: Index of release notes for Codacy Cloud and Codacy Self-hosted.
+icon: megaphone-outline
 hide:
   - toc
 ---
diff --git a/mkdocs.yml b/mkdocs.yml
index 6bc71d5559..01e223ef3e 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -39,6 +39,8 @@ theme:
         - "content.code.copy"
         - "content.tabs.link"
         - "navigation.path"
+        - "navigation.tabs"
+        - "navigation.tabs.sticky"
 extra_css:
     - "stylesheets/fonts.css"
     - "stylesheets/tokens.css"
@@ -67,7 +69,8 @@ extra:
     user_feedback: "true"
     community_url: "https://community.codacy.com/"
     support_email: "support@codacy.com"
-    # Ionicons displayed for top-level entries in the navigation sidebar.
+    # Ionicons displayed for the top section within each tab's sidebar (see
+    # level == 2 handling in theme/partials/nav-item.html).
     sidebar_icons:
         "Documentation home": "home-outline"
         "Getting started": "rocket-outline"
@@ -82,8 +85,9 @@ extra:
         "Codacy API": "code-slash-outline"
         "Managing Codacy Self-hosted": "server-outline"
         "Troubleshooting and FAQs": "medical-outline"
-        "Release notes": "megaphone-outline"
         "Special thanks": "heart-outline"
+        "Cloud": "cloud-outline"
+        "Self-hosted": "server-outline"
     # Do not show a generated-by badge in the footer.
     generator: false
     # Add pull request preview banner
@@ -613,137 +617,139 @@ plugins:
               "repositories-configure/file-extensions.md": "repositories-configure/languages.md"
 
 nav:
-    - Documentation home: "index.md"
-    - Getting started:
-          - getting-started/codacy-quickstart.md
-          - getting-started/configuring-your-repository.md
-          - getting-started/integrating-codacy-with-your-git-workflow.md
-          - Integrating Codacy with your IDE:
-                - getting-started/integrating-codacy-with-intellij-ides.md
-                - getting-started/integrating-codacy-with-visual-studio-code.md
-          - getting-started/supported-languages-and-tools.md
-          - getting-started/which-permissions-does-codacy-need-from-my-account.md
-          - getting-started/adding-a-codacy-badge.md
-    - Codacy Guardrails (IDE Extension):
-          - codacy-guardrails/codacy-guardrails-getting-started.md
-          - codacy-guardrails/codacy-guardrails-how-to-use.md
-          - codacy-guardrails/codacy-guardrails-how-to-configure-rules.md
-          - codacy-guardrails/codacy-guardrails-limitations.md
-          - codacy-guardrails/codacy-guardrails-troubleshooting.md
-          - codacy-guardrails/codacy-guardrails-faq.md
-    - Codacy Cloud CLI:
-          - codacy-cloud-cli/index.md
-    - Codacy AI:
-          - codacy-ai/codacy-ai.md
-    - Repositories on Codacy:
-          - repositories/repository-dashboard.md
-          - repositories/commits.md
-          - repositories/files.md
-          - repositories/issues.md
-          - repositories/coverage.md
-          - repositories/pull-requests.md
-    - Configuring your repositories:
-          - repositories-configure/configuring-code-patterns.md
-          - repositories-configure/managing-branches.md
-          - Managing integrations:
-                - repositories-configure/integrations/github-integration.md
-                - repositories-configure/integrations/gitlab-integration.md
-                - repositories-configure/integrations/bitbucket-integration.md
-                - repositories-configure/integrations/post-commit-hooks.md
-          - repositories-configure/ignoring-files.md
-          - repositories-configure/languages.md
-          - repositories-configure/adjusting-quality-gates.md
-          - repositories-configure/adjusting-quality-goals.md
-          - Setting up code coverage:
-                - coverage-reporter/index.md
-                - coverage-reporter/alternative-ways-of-running-coverage-reporter.md
-                - coverage-reporter/uploading-coverage-in-advanced-scenarios.md
-                - coverage-reporter/troubleshooting-coverage-cli-issues.md
-          - Local analysis:
-                - repositories-configure/local-analysis/client-side-tools.md
-                - repositories-configure/local-analysis/running-aligncheck.md
-                - repositories-configure/local-analysis/running-dartanalyzer.md
-                - repositories-configure/local-analysis/running-deadcode.md
-                - repositories-configure/local-analysis/running-spotbugs.md
-                - repositories-configure/local-analysis/running-eslint.md
-          - repositories-configure/using-submodules.md
-          - repositories-configure/codacy-configuration-file.md
-          - repositories-configure/removing-your-repository.md
-    - Organizations:
-          - organizations/what-are-organizations.md
-          - organizations/managing-repositories.md
-          - organizations/segments.md
-          - Reporting:
-                  - organizations/reporting/organization-overview.md
-                  - organizations/reporting/issues-metrics.md
-                  - organizations/reporting/codacy-usage.md
-          - organizations/using-gate-policies.md
-          - organizations/using-coding-standards.md
-          - organizations/ai-risk-hub.md
-          - Managing integrations:
-                - organizations/integrations/default-git-provider-integration-settings.md
-                - Slack integration for Security issues: organizations/integrations/slack-integration.md
-                - Jira integration for Security and risk management: organizations/integrations/jira-integration.md
-          - organizations/managing-security-and-risk.md
-          - organizations/managing-people.md
-          - organizations/audit-logs-for-organizations.md
-          - organizations/roles-and-permissions-for-organizations.md
-          - organizations/changing-your-plan-and-billing.md
-    - Enterprise Cloud:
-          - enterprise-cloud/github-enterprise-cloud.md
-    - Your account:
-          - account/managing-your-profile.md
-          - account/emails.md
-          - account/user-session-management.md
-    - Codacy API:
-          - codacy-api/using-the-codacy-api.md
-          - codacy-api/api-tokens.md
-          - API v3 reference (recommended): https://api.codacy.com/api/api-docs
-          - API v2 reference: https://api.codacy.com/api-docs
-          - Examples:
-                - codacy-api/examples/adding-people-to-codacy-programmatically.md
-                - codacy-api/examples/adding-repositories-to-codacy-programmatically.md
-                - codacy-api/examples/creating-repository-api-tokens-programmatically.md
-                - codacy-api/examples/obtaining-code-quality-metrics-for-files.md
-                - codacy-api/examples/obtaining-current-issues-in-repositories.md
-                - codacy-api/examples/identifying-commits-without-coverage-data.md
-                - codacy-api/examples/uploading-dast-results.md
-                - codacy-api/examples/triggering-dast-scans.md
-    - Managing Codacy Self-hosted: "!include submodules/chart/mkdocs.yml"
-    - Troubleshooting and FAQs:
-          - General:
-                - faq/general/which-platforms-and-technologies-does-codacy-support.md
-                - faq/general/how-does-codacy-support-github-enterprise.md
-                - faq/general/how-does-codacy-support-gitlab-cloud.md
-                - faq/general/how-does-codacy-support-gitlab-enterprise.md
-                - faq/general/how-does-codacy-support-bitbucket-cloud.md
-                - faq/general/how-does-codacy-support-bitbucket-server.md
-                - faq/general/how-does-codacy-keep-my-data-secure.md
-                - faq/general/how-does-codacy-protect-my-privacy.md
-                - faq/general/does-codacy-keep-audit-logs.md
-                - faq/general/how-do-i-allowlist-codacy-cloud-on-my-git-provider.md
-                - faq/general/how-can-i-change-or-cancel-my-plan.md
-          - Repositories:
-                - faq/repositories/how-do-i-reanalyze-my-repository.md
-                - faq/repositories/i-renamed-my-repository-on-the-git-provider.md
-          - Code analysis:
-                - faq/code-analysis/which-metrics-does-codacy-calculate.md
-                - faq/code-analysis/why-does-codacy-show-unexpected-coverage-changes.md
-                - faq/code-analysis/does-codacy-place-limits-on-the-code-analysis.md
-                - faq/code-analysis/does-codacy-check-for-dependencies.md
-                - faq/code-analysis/how-long-does-it-take-for-my-repository-to-be-analyzed.md
-                - faq/code-analysis/how-to-skip-an-analysis.md
-                - faq/code-analysis/can-i-bypass-codacy-status-check.md
-                - faq/code-analysis/how-to-configure-php-codesniffer-coding-standards.md
-          - Troubleshooting:
-                - faq/troubleshooting/why-cant-i-see-my-organization.md
-                - faq/troubleshooting/why-did-codacy-stop-commenting-on-pull-requests.md
-                - faq/troubleshooting/why-arent-duplication-metrics-being-calculated.md
-                - faq/troubleshooting/why-isnt-my-public-repository-being-analyzed.md
-                - faq/troubleshooting/not-a-member-of-the-organization.md
-                - faq/troubleshooting/we-no-longer-have-access-to-this-repository.md
-                - faq/troubleshooting/why-is-my-file-over-150-kb-missing.md
-                - faq/troubleshooting/error-line-endings.md
+    - Documentation:
+          - Documentation home: "index.md"
+          - Getting started:
+                - getting-started/codacy-quickstart.md
+                - getting-started/configuring-your-repository.md
+                - getting-started/integrating-codacy-with-your-git-workflow.md
+                - Integrating Codacy with your IDE:
+                      - getting-started/integrating-codacy-with-intellij-ides.md
+                      - getting-started/integrating-codacy-with-visual-studio-code.md
+                - getting-started/supported-languages-and-tools.md
+                - getting-started/which-permissions-does-codacy-need-from-my-account.md
+                - getting-started/adding-a-codacy-badge.md
+          - Codacy Guardrails (IDE Extension):
+                - codacy-guardrails/codacy-guardrails-getting-started.md
+                - codacy-guardrails/codacy-guardrails-how-to-use.md
+                - codacy-guardrails/codacy-guardrails-how-to-configure-rules.md
+                - codacy-guardrails/codacy-guardrails-limitations.md
+                - codacy-guardrails/codacy-guardrails-troubleshooting.md
+                - codacy-guardrails/codacy-guardrails-faq.md
+          - Codacy Cloud CLI:
+                - codacy-cloud-cli/index.md
+          - Codacy AI:
+                - codacy-ai/codacy-ai.md
+          - Repositories on Codacy:
+                - repositories/repository-dashboard.md
+                - repositories/commits.md
+                - repositories/files.md
+                - repositories/issues.md
+                - repositories/coverage.md
+                - repositories/pull-requests.md
+          - Configuring your repositories:
+                - repositories-configure/configuring-code-patterns.md
+                - repositories-configure/managing-branches.md
+                - Managing integrations:
+                      - repositories-configure/integrations/github-integration.md
+                      - repositories-configure/integrations/gitlab-integration.md
+                      - repositories-configure/integrations/bitbucket-integration.md
+                      - repositories-configure/integrations/post-commit-hooks.md
+                - repositories-configure/ignoring-files.md
+                - repositories-configure/languages.md
+                - repositories-configure/adjusting-quality-gates.md
+                - repositories-configure/adjusting-quality-goals.md
+                - Setting up code coverage:
+                      - coverage-reporter/index.md
+                      - coverage-reporter/alternative-ways-of-running-coverage-reporter.md
+                      - coverage-reporter/uploading-coverage-in-advanced-scenarios.md
+                      - coverage-reporter/troubleshooting-coverage-cli-issues.md
+                - Local analysis:
+                      - repositories-configure/local-analysis/client-side-tools.md
+                      - repositories-configure/local-analysis/running-aligncheck.md
+                      - repositories-configure/local-analysis/running-dartanalyzer.md
+                      - repositories-configure/local-analysis/running-deadcode.md
+                      - repositories-configure/local-analysis/running-spotbugs.md
+                      - repositories-configure/local-analysis/running-eslint.md
+                - repositories-configure/using-submodules.md
+                - repositories-configure/codacy-configuration-file.md
+                - repositories-configure/removing-your-repository.md
+          - Organizations:
+                - organizations/what-are-organizations.md
+                - organizations/managing-repositories.md
+                - organizations/segments.md
+                - Reporting:
+                      - organizations/reporting/organization-overview.md
+                      - organizations/reporting/issues-metrics.md
+                      - organizations/reporting/codacy-usage.md
+                - organizations/using-gate-policies.md
+                - organizations/using-coding-standards.md
+                - organizations/ai-risk-hub.md
+                - Managing integrations:
+                      - organizations/integrations/default-git-provider-integration-settings.md
+                      - Slack integration for Security issues: organizations/integrations/slack-integration.md
+                      - Jira integration for Security and risk management: organizations/integrations/jira-integration.md
+                - organizations/managing-security-and-risk.md
+                - organizations/managing-people.md
+                - organizations/audit-logs-for-organizations.md
+                - organizations/roles-and-permissions-for-organizations.md
+                - organizations/changing-your-plan-and-billing.md
+          - Enterprise Cloud:
+                - enterprise-cloud/github-enterprise-cloud.md
+          - Your account:
+                - account/managing-your-profile.md
+                - account/emails.md
+                - account/user-session-management.md
+          - Codacy API:
+                - codacy-api/using-the-codacy-api.md
+                - codacy-api/api-tokens.md
+                - API v3 reference (recommended): https://api.codacy.com/api/api-docs
+                - API v2 reference: https://api.codacy.com/api-docs
+                - Examples:
+                      - codacy-api/examples/adding-people-to-codacy-programmatically.md
+                      - codacy-api/examples/adding-repositories-to-codacy-programmatically.md
+                      - codacy-api/examples/creating-repository-api-tokens-programmatically.md
+                      - codacy-api/examples/obtaining-code-quality-metrics-for-files.md
+                      - codacy-api/examples/obtaining-current-issues-in-repositories.md
+                      - codacy-api/examples/identifying-commits-without-coverage-data.md
+                      - codacy-api/examples/uploading-dast-results.md
+                      - codacy-api/examples/triggering-dast-scans.md
+          - Managing Codacy Self-hosted: "!include submodules/chart/mkdocs.yml"
+          - Troubleshooting and FAQs:
+                - General:
+                      - faq/general/which-platforms-and-technologies-does-codacy-support.md
+                      - faq/general/how-does-codacy-support-github-enterprise.md
+                      - faq/general/how-does-codacy-support-gitlab-cloud.md
+                      - faq/general/how-does-codacy-support-gitlab-enterprise.md
+                      - faq/general/how-does-codacy-support-bitbucket-cloud.md
+                      - faq/general/how-does-codacy-support-bitbucket-server.md
+                      - faq/general/how-does-codacy-keep-my-data-secure.md
+                      - faq/general/how-does-codacy-protect-my-privacy.md
+                      - faq/general/does-codacy-keep-audit-logs.md
+                      - faq/general/how-do-i-allowlist-codacy-cloud-on-my-git-provider.md
+                      - faq/general/how-can-i-change-or-cancel-my-plan.md
+                - Repositories:
+                      - faq/repositories/how-do-i-reanalyze-my-repository.md
+                      - faq/repositories/i-renamed-my-repository-on-the-git-provider.md
+                - Code analysis:
+                      - faq/code-analysis/which-metrics-does-codacy-calculate.md
+                      - faq/code-analysis/why-does-codacy-show-unexpected-coverage-changes.md
+                      - faq/code-analysis/does-codacy-place-limits-on-the-code-analysis.md
+                      - faq/code-analysis/does-codacy-check-for-dependencies.md
+                      - faq/code-analysis/how-long-does-it-take-for-my-repository-to-be-analyzed.md
+                      - faq/code-analysis/how-to-skip-an-analysis.md
+                      - faq/code-analysis/can-i-bypass-codacy-status-check.md
+                      - faq/code-analysis/how-to-configure-php-codesniffer-coding-standards.md
+                - Troubleshooting:
+                      - faq/troubleshooting/why-cant-i-see-my-organization.md
+                      - faq/troubleshooting/why-did-codacy-stop-commenting-on-pull-requests.md
+                      - faq/troubleshooting/why-arent-duplication-metrics-being-calculated.md
+                      - faq/troubleshooting/why-isnt-my-public-repository-being-analyzed.md
+                      - faq/troubleshooting/not-a-member-of-the-organization.md
+                      - faq/troubleshooting/we-no-longer-have-access-to-this-repository.md
+                      - faq/troubleshooting/why-is-my-file-over-150-kb-missing.md
+                      - faq/troubleshooting/error-line-endings.md
+          - special-thanks.md
     - Release notes:
           - release-notes/index.md
           - Cloud:
@@ -908,4 +914,3 @@ nav:
                       - release-notes/self-hosted/self-hosted-v1.1.0.md
                       - release-notes/self-hosted/self-hosted-v1.0.1.md
                       - release-notes/self-hosted/self-hosted-v1.0.0.md
-    - special-thanks.md
diff --git a/theme/assets/vendor/ionicons/svg/cloud-outline.svg b/theme/assets/vendor/ionicons/svg/cloud-outline.svg
new file mode 100644
index 0000000000..2da3b38e09
--- /dev/null
+++ b/theme/assets/vendor/ionicons/svg/cloud-outline.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M400 240c-8.89-89.54-71-144-144-144-69 0-113.44 48.2-128 96-60 6-112 43.59-112 112 0 66 54 112 120 112h260c55 0 100-27.44 100-88 0-59.82-53-85.76-96-88z" fill="none" stroke="currentColor" stroke-linejoin="round" stroke-width="32"/></svg>
diff --git a/theme/partials/header.html b/theme/partials/header.html
index df8bdef565..ddac08b6da 100644
--- a/theme/partials/header.html
+++ b/theme/partials/header.html
@@ -14,7 +14,7 @@
     <label class="md-header__button md-icon" for="__drawer" role="button" tabindex="0" aria-label="Open navigation" aria-controls="docs-navigation" aria-expanded="false" data-drawer-trigger>
       {{ icon("menu-outline") }}
     </label>
-    <label class="docs-search-trigger" for="__search" role="button" tabindex="0" data-search-trigger aria-label="Open search" aria-haspopup="dialog" aria-controls="docs-search" aria-expanded="false">
+    <label class="docs-search-trigger" role="button" tabindex="0" data-search-trigger aria-label="Open search" aria-haspopup="dialog" aria-controls="docs-search" aria-expanded="false">
       {{ icon("search-outline") }}
       <span>Search documentation</span><kbd data-search-shortcut>⌘ K</kbd>
     </label>
diff --git a/theme/partials/nav-item.html b/theme/partials/nav-item.html
index 420a8fe856..2ee54dfa00 100644
--- a/theme/partials/nav-item.html
+++ b/theme/partials/nav-item.html
@@ -17,10 +17,10 @@
 {% macro render_content(nav_item, ref, level = none) %}
   {% set ref = ref or nav_item %}
   {% set section_icons = config.extra.sidebar_icons or {} %}
-  {% if level == 1 and section_icons.get(nav_item.title) %}
+  {% if (level == 1 or (level == 2 and "navigation.tabs" in features)) and section_icons.get(nav_item.title) %}
     {{ icon(section_icons.get(nav_item.title), "docs-nav-section-icon" ~ ("" if nav_item.children else " docs-nav-section-icon--standalone")) }}
   {% elif nav_item.meta and nav_item.meta.icon %}
-    {% include ".icons/" ~ nav_item.meta.icon ~ ".svg" %}
+    {{ icon(nav_item.meta.icon, "docs-nav-section-icon" ~ ("" if nav_item.children else " docs-nav-section-icon--standalone")) }}
   {% endif %}
   <span class="md-ellipsis">
     {{ render_title(ref) }}
diff --git a/theme/stylesheets/base.css b/theme/stylesheets/base.css
index 5efdf749ef..15b455694f 100644
--- a/theme/stylesheets/base.css
+++ b/theme/stylesheets/base.css
@@ -1,6 +1,11 @@
 html { font-size: 100%; }
 
-html { scroll-padding-top: 5rem; scroll-behavior: smooth; }
+/* scroll-margin-top on headings (content.css) handles the sticky-header
+   offset for anchor jumps. A page-wide scroll-padding-top here would also
+   apply to focus()-triggered scrolling of anything inside the sticky header
+   itself (e.g. the search trigger), which sits within that reserved band and
+   would get nudged out of it — producing a large, jarring scroll on focus. */
+html { scroll-behavior: smooth; }
 @media (prefers-reduced-motion: reduce) { html { scroll-behavior: auto; } }
 
 body { color: var(--docs-text); font-family: Inter, ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif; }
diff --git a/theme/stylesheets/content.css b/theme/stylesheets/content.css
index 91d6b2de40..ddac3196fc 100644
--- a/theme/stylesheets/content.css
+++ b/theme/stylesheets/content.css
@@ -1,5 +1,15 @@
 .md-content__inner { position: relative; padding-top: 1.25rem; padding-bottom: 3rem; }
+/* Material only gives .md-content__inner its right-hand gutter (margin-right:
+   1.2rem) via a `:not([hidden])` sidebar selector, so pages that hide the TOC
+   through `hide: - toc` (native `[hidden]` attribute) lose 0.4rem of margin and
+   end up wider than every other page. Restore it so widths stay consistent. */
+.md-sidebar--secondary[hidden] ~ .md-content > .md-content__inner { margin-right: 1.2rem; }
 .md-typeset { color: var(--docs-text-secondary); font-size: 1rem; line-height: 1.7; }
+/* Offsets anchor jumps (TOC links, in-page #hash links) so headings don't land
+   under the sticky header. Scoped to headings rather than a page-wide
+   scroll-padding-top on <html>, which also caught focus() calls on elements
+   inside the header itself and caused a large scroll jump on search open. */
+.md-typeset h1, .md-typeset h2, .md-typeset h3, .md-typeset h4, .md-typeset h5, .md-typeset h6 { scroll-margin-top: 5rem; }
 .md-typeset h1, .md-typeset h2, .md-typeset h3, .md-typeset h4, .md-typeset h5 { color: var(--docs-text); font-weight: 700; letter-spacing: -.025em; }
 .md-typeset h1 { margin: 0 0 1.5rem; font-size: 1.875rem; line-height: 1.25; }
 .md-typeset h2 { margin-top: 3rem; padding-top: .25rem; font-size: 1.5rem; line-height: 1.35; }
diff --git a/theme/stylesheets/header.css b/theme/stylesheets/header.css
index fc3ba65bd6..af9294cb45 100644
--- a/theme/stylesheets/header.css
+++ b/theme/stylesheets/header.css
@@ -1,8 +1,8 @@
-.md-header { border-bottom: 1px solid var(--docs-border); background: color-mix(in srgb, var(--docs-bg) 68%, transparent); box-shadow: none; -webkit-backdrop-filter: blur(16px) saturate(180%); backdrop-filter: blur(16px) saturate(180%); }
+.md-header { border-bottom: 0; background: color-mix(in srgb, var(--docs-bg) 68%, transparent); box-shadow: none; -webkit-backdrop-filter: blur(16px) saturate(180%); backdrop-filter: blur(16px) saturate(180%); }
 .md-header__inner { display: grid; grid-template-columns: auto 1fr minmax(15rem, 30rem) 1fr auto auto auto; gap: .65rem; min-height: 4rem; align-items: center; }
 .md-header__button { margin: 0; color: var(--docs-text-secondary); }
 
-.md-header__button.md-logo { display: inline-flex; margin: 0; overflow: hidden; }
+.md-header__button.md-logo { display: inline-flex; justify-self: start; margin: 0; overflow: hidden; }
 .md-header__button.md-logo img { display: block; width: auto; height: 1.75rem; max-width: none; }
 .md-header__button.md-logo img.docs-logo--light { display: none; }
 [data-md-color-scheme="codacy-light"] .md-header__button.md-logo img.docs-logo--dark { display: none; }
@@ -33,14 +33,38 @@ body[data-md-color-scheme="codacy-light"] [data-md-component="palette"] .docs-pa
 body[data-md-color-scheme="codacy-dark"] [data-md-component="palette"] .docs-palette__fallback-button--dark { display: inline-flex; }
 .md-header [data-md-component="palette"]:hover { border-color: var(--docs-border-strong); color: var(--docs-text-secondary); }
 .md-header [data-md-component="palette"] .md-header__button:focus-visible { outline: 2px solid var(--docs-link); outline-offset: 3px; }
-.md-header .md-search { display: block; position: fixed; inset: 0; z-index: 100; width: auto; visibility: hidden; opacity: 0; pointer-events: none; background: color-mix(in srgb, var(--docs-bg) 55%, transparent); backdrop-filter: blur(3px); }
-/* Material locks the page when search opens. Keep the header fixed so the
-   search backdrop can filter every navbar control consistently. */
-.md-toggle[data-md-toggle="search"]:checked ~ .md-header { position: fixed; top: 0; right: 0; left: 0; z-index: 101; }
-.md-toggle[data-md-toggle="search"]:checked ~ .md-header [data-md-component="palette"] { max-width: 2.25rem; opacity: 1; transition: none; }
+/* .md-header's own backdrop-filter makes it a containing block for
+   position:fixed descendants, so inset:0 here would resolve against the
+   header's own (much shorter) box instead of the viewport. top/left/right
+   still land correctly since the sticky header sits flush with the viewport
+   edges, but height needs the vh unit, which always resolves against the
+   real viewport regardless of containing block. */
+.md-header .md-search { display: block; position: fixed; top: 0; right: 0; left: 0; height: 100dvh; z-index: 100; width: auto; visibility: hidden; opacity: 0; pointer-events: none; background: color-mix(in srgb, var(--docs-bg) 55%, transparent); -webkit-backdrop-filter: blur(3px); backdrop-filter: blur(3px); }
+/* Material locks the page when search opens. The header is already sticky,
+   which keeps it pinned at the top without a position switch — switching to
+   fixed removes it from the flow and collapses its reserved space, which was
+   snapping the page up by the header's height the instant search opened.
+   Just raise the stacking order so the search backdrop sits over the navbar.
+   A colour wash reads inconsistently across the navbar's mixed backgrounds
+   (solid CTA, icon tiles, plain text), so dim every control by the same
+   relative amount via opacity instead of layering a tint on top. */
+.md-toggle[data-md-toggle="search"]:checked ~ .md-header { z-index: 101; }
+.md-toggle[data-md-toggle="search"]:checked ~ .md-header .md-logo,
+.md-toggle[data-md-toggle="search"]:checked ~ .md-header .md-header__button.md-icon,
+.md-toggle[data-md-toggle="search"]:checked ~ .md-header .docs-search-trigger,
+.md-toggle[data-md-toggle="search"]:checked ~ .md-header .version-select-container,
+.md-toggle[data-md-toggle="search"]:checked ~ .md-header .docs-header__cta,
+.md-toggle[data-md-toggle="search"]:checked ~ .md-header .md-tabs { opacity: .35; transition: opacity .15s ease; }
+.md-toggle[data-md-toggle="search"]:checked ~ .md-header [data-md-component="palette"] { max-width: 2.25rem; opacity: .35; transition: none; }
 .md-toggle[data-md-toggle="search"]:not(:checked) ~ .md-header .md-search__inner { width: 0; height: 0; margin: 0; overflow: hidden; }
 .md-toggle[data-md-toggle="search"]:checked ~ .md-header .md-search { visibility: visible; opacity: 1; pointer-events: auto; }
 .md-search__overlay { display: block; position: absolute; inset: 0; background: transparent; }
+/* Material only makes this a real, clickable full-page catcher at >=60em —
+   below that it shrinks to a decorative 2rem circle with pointer-events:none
+   (it expects mobile users to close via the header icon instead). Force the
+   same full-coverage, clickable overlay at every width so tapping outside
+   the search box closes it on mobile too, matching desktop. */
+.md-toggle[data-md-toggle="search"]:checked ~ .md-header .md-search__overlay { inset: 0; width: auto; height: auto; transform: none; pointer-events: auto; }
 .md-search__inner { position: relative; z-index: 1; display: flex; float: none; flex-direction: column; width: min(40rem, calc(100vw - 3rem)); max-height: calc(100dvh - 6.5rem); height: auto; margin: clamp(4.75rem, 8vh, 5.25rem) auto 0; overflow: hidden; border: 1px solid var(--docs-border); border-radius: var(--docs-radius); background: var(--docs-bg); box-shadow: 0 24px 48px color-mix(in srgb, var(--docs-text) 12%, transparent), 0 0 0 1px color-mix(in srgb, var(--docs-bg) 72%, transparent) inset; }
 [dir="ltr"] .md-search__inner, [dir="rtl"] .md-search__inner { float: none; }
 .md-toggle[data-md-toggle="search"]:checked ~ .md-header .md-search__inner { width: min(40rem, calc(100vw - 3rem)); max-height: calc(100dvh - 6.5rem); height: auto; margin: clamp(4.75rem, 8vh, 5.25rem) auto 0; overflow: hidden; transform: none; }
@@ -50,8 +74,6 @@ body[data-md-color-scheme="codacy-dark"] [data-md-component="palette"] .docs-pal
 .md-search .md-search__suggest { color: var(--docs-text-tertiary); }
 .md-search .md-search__icon[for="__search"] { top: 50%; left: 1rem; width: 1rem; height: 1rem; transform: translateY(-50%); color: var(--docs-text-tertiary); }
 .md-search .md-search__icon[for="__search"] svg { width: 1rem; height: 1rem; }
-.md-search .md-search__icon[for="__search"] svg:first-child { display: block; }
-.md-search .md-search__icon[for="__search"] svg:last-child { display: none; }
 .md-search .md-search__options { position: absolute; top: .7rem; right: .7rem; z-index: 3; }
 .md-search .md-search__options .md-search__icon { display: grid; width: 2rem; height: 2rem; place-items: center; border-radius: var(--docs-radius); color: var(--docs-text-tertiary); }
 .md-search .md-search__options .md-search__icon svg { width: 1rem; height: 1rem; }
diff --git a/theme/stylesheets/layout.css b/theme/stylesheets/layout.css
index e27e31989f..df67cee333 100644
--- a/theme/stylesheets/layout.css
+++ b/theme/stylesheets/layout.css
@@ -1,4 +1,4 @@
-.md-header__inner, .md-main__inner, .docs-footer__inner {
+.md-header__inner, .md-main__inner, .docs-footer__inner, .md-tabs .md-grid {
   box-sizing: border-box;
   max-width: 90rem;
   margin-inline: auto;
diff --git a/theme/stylesheets/navigation.css b/theme/stylesheets/navigation.css
index c89198ec73..477f31e2bf 100644
--- a/theme/stylesheets/navigation.css
+++ b/theme/stylesheets/navigation.css
@@ -9,12 +9,21 @@
 
 .md-sidebar--primary .md-nav--primary > .md-nav__list { padding-inline: 1rem; }
 .md-sidebar--primary .md-nav--primary .md-nav__link { margin-inline: 0; padding: .5rem; border-radius: var(--docs-radius-sm); }
-.docs-nav-section-icon { flex: 0 0 .95rem; width: .95rem; height: .95rem; margin-right: .45rem; color: var(--docs-text-secondary); }
+/* Material's stock ".md-nav__link svg { height: 1.3em }" outranks a plain
+   class selector on specificity, stretching every sidebar icon vertically.
+   Qualify with the element type to match and win on source order instead. */
+svg.docs-nav-section-icon { flex: 0 0 .95rem; width: .95rem; height: .95rem; margin-right: .45rem; color: var(--docs-text-secondary); }
 .docs-nav-section-icon--standalone { color: var(--docs-text-secondary); transition: color .12s ease; }
 .md-nav__link--active .docs-nav-section-icon--standalone { color: var(--docs-link); }
 
 .md-sidebar--primary .md-nav--primary > .md-nav__list > .md-nav__item { margin-block: .25rem; }
 .md-nav--primary > .md-nav__list > .md-nav__item > .md-nav__link { margin-top: 0; }
+/* Material's stock ".md-nav__link:focus { color: var(--md-accent-fg-color) }"
+   fires on plain :focus, not just :focus-visible — a link stays focused (and
+   blue) after a mouse click, not only real keyboard navigation, which reads
+   as a second "active" item sitting right under the actual one. Restrict the
+   accent color to genuine keyboard focus and non-active links. */
+.md-nav__link:focus:not(:focus-visible):not(.md-nav__link--active) { color: var(--docs-text-secondary); }
 .md-sidebar--primary .md-nav__link:is(:hover, :focus-visible) { color: var(--docs-text); background: var(--docs-bg-secondary); }
 .md-sidebar--primary .md-nav__item .md-nav__link--active { background: var(--docs-bg-brand); }
 .md-sidebar--primary .md-nav__item .md-nav__link--active:is(:hover, :focus-visible) { color: var(--docs-link); background: var(--docs-bg-brand); }
@@ -37,6 +46,13 @@
 .md-nav--primary .md-nav__toggle ~ .md-nav > .md-nav__list { padding-left: 0; }
 
 .md-nav--primary .md-nav .md-nav__toggle ~ .md-nav > .md-nav__list { padding-left: .8rem; }
+
+/* Align level-3 pages (the ones revealed when you expand a tab's top-level
+   group) with that group's own text, not just Material's default indent.
+   Scoped to exactly this depth via a full child-selector chain so it
+   doesn't cascade into deeper levels (FAQ subcategories, release-notes
+   years), which should keep the smaller default indent. */
+.md-nav--primary > .md-nav__list > .md-nav__item > .md-nav > .md-nav__list > .md-nav__item > .md-nav > .md-nav__list { padding-left: 1.8rem; }
 .md-sidebar__scrollwrap { overscroll-behavior: contain; scrollbar-color: auto !important; scrollbar-gutter: auto; scrollbar-width: auto !important; }
 .md-sidebar__scrollwrap::-webkit-scrollbar, .md-sidebar__scrollwrap::-webkit-scrollbar-thumb, .md-sidebar__scrollwrap::-webkit-scrollbar-track { width: auto; height: auto; background: initial !important; }
 .md-sidebar__scrollwrap::-webkit-scrollbar-thumb:hover { background: initial !important; }
@@ -62,3 +78,12 @@
 .md-path__item + .md-path__item::before { display: none; }
 .docs-ionicon--breadcrumb { flex: 0 0 .8rem; width: .8rem; height: .8rem; margin: 0 .2rem; color: var(--docs-text-tertiary); }
 .md-path__item:first-child .docs-ionicon--breadcrumb { display: none; }
+
+.md-tabs { border-bottom: 1px solid var(--docs-border); background: transparent; }
+.md-tabs__list { gap: .25rem; margin-inline: 0; }
+.md-tabs__item { height: 2.75rem; padding-inline: .5rem; }
+.md-tabs__item:first-child { padding-left: 0; }
+.md-tabs__item:last-child { padding-right: 0; }
+.md-tabs__link { display: flex; height: 100%; align-items: center; margin-top: 0; padding: 0 .1rem; border-bottom: 2px solid transparent; color: var(--docs-text-secondary); font-size: .8125rem; font-weight: 600; opacity: 1; transition: color .12s ease, border-color .12s ease; }
+.md-tabs__link:hover { color: var(--docs-text); }
+.md-tabs__item--active .md-tabs__link { border-bottom-color: var(--docs-link); color: var(--docs-link); opacity: 1; }
diff --git a/theme/stylesheets/responsive.css b/theme/stylesheets/responsive.css
index 4ac0c5338a..998bfc9e3c 100644
--- a/theme/stylesheets/responsive.css
+++ b/theme/stylesheets/responsive.css
@@ -2,10 +2,16 @@
 
   :root { --docs-frame-gutter: 2rem; }
 
-  .md-main__inner {
+  /* Defined on :root, not .md-main__inner, so the header (a sibling, not a
+     descendant, of .md-main__inner) can also read these to line its own
+     columns up with the content grid below it. */
+  :root {
     --docs-primary-rail-width: 16rem;
     --docs-toc-width: 12rem;
     --docs-grid-gap: 2rem;
+  }
+
+  .md-main__inner {
     position: relative;
     display: grid;
     grid-template-columns: var(--docs-primary-rail-width) minmax(0, 1fr) var(--docs-toc-width);
@@ -24,6 +30,40 @@
   .md-header__button[data-drawer-trigger] { display: none; }
   .md-nav--primary > .md-nav__title { display: none; }
 
+  /* The active tab's own name already shows in the .md-tabs bar above, so
+     drop the redundant repeated label at the top of its sidebar (mobile
+     still needs it — it's the only place a tab name appears there). */
+  .md-nav--lifted > .md-nav__list > .md-nav__item > .md-nav__link { display: none; }
+
+  /* Material's own lifted-nav rule pulls each tab's level-2 list left by
+     .6rem (it assumes the now-hidden tab-name label above it needs the
+     extra room). With that label gone, the negative margin instead shifts
+     level-2 icons past the sidebar's left edge, clipping them. */
+  [dir="ltr"] .md-nav--lifted > .md-nav__list > .md-nav__item > .md-nav:not(.md-nav--secondary) { margin-left: 0; }
+  [dir="rtl"] .md-nav--lifted > .md-nav__list > .md-nav__item > .md-nav:not(.md-nav--secondary) { margin-right: 0; }
+
+  /* Give each tab's top-level items (e.g. "Quality", "Configuring your
+     repositories", but also flat pages like "AI" or "Documentation home")
+     the same small/bold/uppercase treatment the tab-name label above used
+     to have, now that it's the highest-level heading actually visible in
+     the sidebar. Applied uniformly regardless of whether the item has
+     children, so flat pages don't look out of place next to groups. */
+  .md-nav--lifted > .md-nav__list > .md-nav__item > .md-nav > .md-nav__list > .md-nav__item > .md-nav__link {
+    font-size: .75rem;
+    font-weight: 700;
+    letter-spacing: .025em;
+    text-transform: uppercase;
+  }
+
+  /* A group's collapsed submenu still reserves .4rem of height (Material's
+     .md-nav__toggle ~ .md-nav uses grid-template-rows: minmax(.4rem, 0fr)),
+     so it sits .4rem further from the item below it than a flat page like
+     "Documentation home" does, which has no submenu to reserve that space.
+     Add it back so flat and group items keep the same bottom spacing. */
+  .md-nav--lifted > .md-nav__list > .md-nav__item > .md-nav > .md-nav__list > .md-nav__item:not(.md-nav__item--nested) {
+    margin-bottom: .4rem;
+  }
+
   .md-path { margin-top: 1.25rem; margin-right: 1.2rem; margin-left: 1.2rem; }
   .md-sidebar--primary { padding-top: .75rem; }
   .md-sidebar--secondary { padding-top: .75rem; }
@@ -40,20 +80,42 @@
 
   .md-sidebar--primary .md-sidebar__scrollwrap { scrollbar-gutter: stable !important; }
 
+  @supports (hanging-punctuation: first) {
+    .md-sidebar--primary .md-sidebar__scrollwrap { overflow-y: scroll; }
+  }
+
   .md-sidebar--primary .md-nav--primary > .md-nav__list { padding-inline: 0; }
   .md-sidebar--primary .md-nav--primary .md-nav__link { margin-inline: 0; }
   [dir="ltr"] .md-sidebar--primary .md-nav--primary .md-nav__link { margin-right: 0; }
   [dir="rtl"] .md-sidebar--primary .md-nav--primary .md-nav__link { margin-left: 0; }
 
   .md-sidebar__inner, .md-sidebar--secondary .md-sidebar__inner { padding-top: 0; }
+
+  /* Line the header up with the content grid below it: the logo's column
+     absorbs the sidebar's rail width (plus the grid's own gap, minus the
+     header's smaller inter-item gap counted twice for the now-empty spacer
+     column next to it) so the search field starts flush with where the
+     article column starts, instead of floating in the middle of the bar.
+     Skipped on pages with no visible sidebar (e.g. the 404 page), which keep
+     the original centered layout. */
+  .md-header:has(+ .md-container .md-sidebar--primary:not([hidden])):not(:has(+ .md-container .docs-error)) .md-header__inner {
+    grid-template-columns: calc(var(--docs-primary-rail-width) + var(--docs-grid-gap) - 1.3rem) 0 minmax(15rem, 30rem) 1fr auto auto auto;
+  }
+  .md-header:has(+ .md-container .md-sidebar--primary:not([hidden])):not(:has(+ .md-container .docs-error)) .docs-search-trigger {
+    margin: 0 1.2rem;
+  }
 }
 
 @media screen and (min-width: 80em) {
 
-  .md-main__inner { --docs-primary-rail-width: 18rem; --docs-toc-width: 14rem; --docs-grid-gap: 3rem; }
+  :root { --docs-primary-rail-width: 18rem; --docs-toc-width: 14rem; --docs-grid-gap: 3rem; }
 }
 
 @media screen and (max-width: 76.2344em) {
+  /* Below this breakpoint .md-tabs (and the border-bottom that comes with it)
+     is hidden, so the navbar loses the divider line it has on desktop. Add it
+     directly to the header instead so the two breakpoints look consistent. */
+  .md-header { border-bottom: 1px solid var(--docs-border); }
   .md-sidebar--secondary:not([hidden]) { display: none; }
 
   .md-nav--primary > .md-nav__list > .md-nav__item > .md-nav__link { margin-top: .25rem; }