diff --git a/_includes/header--help.html b/_includes/header--help.html
index 9d46b72a4..36c48810a 100644
--- a/_includes/header--help.html
+++ b/_includes/header--help.html
@@ -66,7 +66,7 @@
       </div>
 
       <a
-        class="usa-link desktop:display-none padding-y-1 margin-y-3 text-no-underline text-bold"
+        class="usa-link display-block desktop:display-none padding-y-1 margin-y-3 text-no-underline text-bold"
         href="{{ '/contact/' | locale_url }}"
       >
         {{ site.data.[page.lang].settings.nav.contact_us.title }}
diff --git a/_includes/header.html b/_includes/header.html
index dd8891df6..81653fde4 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -23,58 +23,60 @@
     </div>
 
     <nav class="usa-nav" aria-label="{{ site.data.[page.lang].settings.accessible_labels.primary_navigation }}">
-      <button class="usa-nav__close">
-        <img src="{{ site.baseurl }}/assets/img/close.svg" alt="Close" />
-      </button>
+      <div class="usa-nav__inner">
+        <button class="usa-nav__close">
+          <img src="{{ site.baseurl }}/assets/img/close.svg" alt="Close" />
+        </button>
 
-      {% include sign_in.html mobile="mobile" %}
+        {% include sign_in.html mobile="mobile" %}
 
-      <ul class="usa-nav__primary usa-accordion">
-        <li class="usa-nav__primary-item">
-          <a
-            class="usa-nav__link {% if page.url contains '/what-is-login/' %}usa-current{% endif %}"
-            href="{{ '/what-is-login/' | locale_url }}"
-          >
-            <span class="usa-nav__link__inner">{{ site.data.[page.lang].settings.nav.what_is_login_gov }}</span>
-          </a>
-        </li>
-        <li class="usa-nav__primary-item">
-          <a
-            class="usa-nav__link {% if page.url contains '/who-uses-login/' %}usa-current{% endif %}"
-            href="{{ '/who-uses-login/' | locale_url }}"
-          >
-            <span class="usa-nav__link__inner">{{ site.data.[page.lang].settings.nav.who_uses_login_gov }}</span>
-          </a>
-        </li>
-        <li class="usa-nav__primary-item">
-          <a
-            class="usa-nav__link {% if page.url contains '/create-an-account/' %}usa-current{% endif %}"
-            href="{{ '/create-an-account/' | locale_url }}"
-          >
-            <span class="usa-nav__link__inner">{{ site.data.[page.lang].settings.nav.create_an_account }}</span>
-          </a>
-        </li>
-        <li class="usa-nav__primary-item">
-          <a
-            class="usa-nav__link {% if page.url contains '/help/' %}usa-current{% endif %}"
-            href="{{ '/help/' | locale_url }}"
-          >
-            <span class="usa-nav__link__inner">{{ site.data.[page.lang].settings.nav.help_center }}</span>
-          </a>
-        </li>
-      </ul>
+        <ul class="usa-nav__primary usa-accordion">
+          <li class="usa-nav__primary-item">
+            <a
+              class="usa-nav__link {% if page.url contains '/what-is-login/' %}usa-current{% endif %}"
+              href="{{ '/what-is-login/' | locale_url }}"
+            >
+              {{ site.data.[page.lang].settings.nav.what_is_login_gov }}
+            </a>
+          </li>
+          <li class="usa-nav__primary-item">
+            <a
+              class="usa-nav__link {% if page.url contains '/who-uses-login/' %}usa-current{% endif %}"
+              href="{{ '/who-uses-login/' | locale_url }}"
+            >
+              {{ site.data.[page.lang].settings.nav.who_uses_login_gov }}
+            </a>
+          </li>
+          <li class="usa-nav__primary-item">
+            <a
+              class="usa-nav__link {% if page.url contains '/create-an-account/' %}usa-current{% endif %}"
+              href="{{ '/create-an-account/' | locale_url }}"
+            >
+              {{ site.data.[page.lang].settings.nav.create_an_account }}
+            </a>
+          </li>
+          <li class="usa-nav__primary-item">
+            <a
+              class="usa-nav__link {% if page.url contains '/help/' %}usa-current{% endif %}"
+              href="{{ '/help/' | locale_url }}"
+            >
+              {{ site.data.[page.lang].settings.nav.help_center }}
+            </a>
+          </li>
+        </ul>
 
-      <a
-        class="usa-link desktop:display-none padding-y-1 margin-y-3 text-no-underline text-bold"
-        href="{{ '/contact/' | locale_url }}"
-      >
-        {{ site.data.[page.lang].settings.nav.contact_us.title }}
-      </a>
+        <a
+          class="usa-link display-block desktop:display-none padding-y-1 margin-y-3 text-no-underline text-bold"
+          href="{{ '/contact/' | locale_url }}"
+        >
+          {{ site.data.[page.lang].settings.nav.contact_us.title }}
+        </a>
 
-      {% include search.html id="header-nav" %}
+        {% include search.html id="header-nav" %}
 
-      <div class="desktop:display-none margin-top-3">
-        {% include language_picker.html id="mobile-list" %}
+        <div class="desktop:display-none margin-top-3">
+          {% include language_picker.html id="mobile-list" %}
+        </div>
       </div>
     </nav>
   </div>
diff --git a/_includes/hero--search.html b/_includes/hero--search.html
index 5f3b3bd0c..413b11a4a 100644
--- a/_includes/hero--search.html
+++ b/_includes/hero--search.html
@@ -1,4 +1,4 @@
-<section class="hero hero--search">
+<section class="usa-section--dark hero hero--search">
   <div class="container display-flex flex-column flex-justify-center text-center">
     <h1 class="hero__title">{{ site.data.[page.lang].settings.help_page.title }}</h1>
     <div class="hero__description">{% include search.html size="big" id="help-hero" %}</div>
diff --git a/_includes/partners/header.html b/_includes/partners/header.html
index d659b3511..d7326ef1b 100644
--- a/_includes/partners/header.html
+++ b/_includes/partners/header.html
@@ -12,7 +12,7 @@
 
 <div class="usa-header usa-header--extended">
   <div class="usa-nav-container">
-    <div class="usa-navbar desktop:flex-justify partners-navbar margin-bottom-4">
+    <div class="usa-navbar margin-bottom-3">
       <div class="usa-logo partners-logo" id="extended-logo">
         <a href="{{ '/partners/' | prepend: site.baseurl }}" aria-label="Home">
           <img
@@ -29,66 +29,68 @@
     </div>
 
     <nav class="usa-nav" aria-label="{{ site.data.[page.lang].settings.accessible_labels.primary_navigation }}">
-      <button class="usa-nav__close">
-        <img src="{{ site.baseurl }}/assets/img/close.svg" alt="Close" />
-      </button>
+      <div class="usa-nav__inner">
+        <button class="usa-nav__close">
+          <img src="{{ site.baseurl }}/assets/img/close.svg" alt="Close" />
+        </button>
 
-      <ul class="usa-nav__primary usa-accordion">
-        <li class="usa-nav__primary-item">
-          <a
-            class="usa-nav__link {% if page.url contains '/our-services' %}usa-current{% endif %}"
-            href="{{ '/partners/our-services/' | locale_url }}"
-          >
-            <span class="usa-nav__link__inner">Our services</span>
-          </a>
-        </li>
-        <li class="usa-nav__primary-item">
-          <a
-            class="usa-nav__link {% if page.url contains '/impact-stories' %}usa-current{% endif %}"
-            href="{{ '/partners/impact-stories/' | locale_url }}"
-          >
-            <span class="usa-nav__link__inner">Impact stories</span>
-          </a>
-        </li>
-        <li class="usa-nav__primary-item">
+        <ul class="usa-nav__primary usa-accordion">
+          <li class="usa-nav__primary-item">
+            <a
+              class="usa-nav__link {% if page.url contains '/our-services' %}usa-current{% endif %}"
+              href="{{ '/partners/our-services/' | locale_url }}"
+            >
+              Our services
+            </a>
+          </li>
+          <li class="usa-nav__primary-item">
+            <a
+              class="usa-nav__link {% if page.url contains '/impact-stories' %}usa-current{% endif %}"
+              href="{{ '/partners/impact-stories/' | locale_url }}"
+            >
+              Impact stories
+            </a>
+          </li>
+          <li class="usa-nav__primary-item">
+            <a
+              class="usa-nav__link {% if page.url contains '/security-experience' %}usa-current{% endif %}"
+              href="{{ '/partners/security-experience/' | locale_url }}"
+            >
+              Security experience
+            </a>
+          </li>
+          <li class="usa-nav__primary-item">
+            <a
+              class="usa-nav__link {% if page.url contains '/faq' %}usa-current{% endif %}"
+              href="{{ '/partners/faq/' | locale_url }}"
+            >
+              FAQ
+            </a>
+          </li>
+        </ul>
+
+        <div class="partners-actions">
           <a
-            class="usa-nav__link {% if page.url contains '/security-experience' %}usa-current{% endif %}"
-            href="{{ '/partners/security-experience/' | locale_url }}"
+            class="{{include.mobile}} usa-button usa-button--outline {% if page.url contains '/state-and-local' %}partners-usa-button--active{% endif %}"
+            href="{{ site.baseurl }}/partners/state-and-local/"
+            >State and local</a
           >
-            <span class="usa-nav__link__inner">Security experience</span>
-          </a>
-        </li>
-        <li class="usa-nav__primary-item">
           <a
-            class="usa-nav__link {% if page.url contains '/faq' %}usa-current{% endif %}"
-            href="{{ '/partners/faq/' | locale_url }}"
+            class="{{include.mobile}} usa-button {% if page.url contains '/get-started' %}usa-button--active{% endif %}"
+            href="{{ site.baseurl }}/partners/get-started/"
+            >Get started</a
           >
-            <span class="usa-nav__link__inner">FAQ</span>
-          </a>
-        </li>
-      </ul>
+        </div>
 
-      <div class="partners-actions">
-        <a
-          class="{{include.mobile}} usa-button usa-button--outline {% if page.url contains '/state-and-local' %}partners-usa-button--active{% endif %}"
-          href="{{ site.baseurl }}/partners/state-and-local/"
-          >State and local</a
-        >
         <a
-          class="{{include.mobile}} usa-button {% if page.url contains '/get-started' %}usa-button--active{% endif %}"
-          href="{{ site.baseurl }}/partners/get-started/"
-          >Get started</a
+          class="usa-link display-block desktop:display-none padding-y-1 margin-y-3 text-no-underline text-bold"
+          href="{{ site.baseurl }}/partners/business-inquiries/"
         >
-      </div>
-
-      <a
-        class="usa-link desktop:display-none padding-y-1 margin-y-3 text-no-underline text-bold"
-        href="{{ site.baseurl }}/partners/business-inquiries/"
-      >
-        {{ site.data.[page.lang].settings.nav.business_inquiries.title }}
-      </a>
+          {{ site.data.[page.lang].settings.nav.business_inquiries.title }}
+        </a>
 
-      <div class="desktop:display-none">{% include search.html id="mobile" %}</div>
+        <div class="desktop:display-none">{% include search.html id="mobile" %}</div>
+      </div>
     </nav>
   </div>
 </div>
diff --git a/_layouts/landing.html b/_layouts/landing.html
index 5a8d80fda..add6b3894 100644
--- a/_layouts/landing.html
+++ b/_layouts/landing.html
@@ -7,7 +7,8 @@
   {% include header.html %}
 </header>
 <main id="main-content">
-  {% include hero.html class=page.class heading=page.title text=page.description %}
+  {% assign hero_class = page.class | default: '' | append: ' usa-section--dark' %}
+  {% include hero.html class=hero_class heading=page.title text=page.description %}
 
   {% if page.class == 'what-is-login' %}
     {% include components/2-col.html class=page.class col1=page.component.col1 bannertext=page.component.bannertext bannercol1=page.component.bannercol1 bannercol2=page.component.bannercol2 col2=page.component.col2 image=page.component.image %}
diff --git a/_layouts/sidenav.html b/_layouts/sidenav.html
index c313c27bb..1ac67abab 100644
--- a/_layouts/sidenav.html
+++ b/_layouts/sidenav.html
@@ -40,7 +40,7 @@
 {{ page.title }}
 {% endcapture %}
 
-{% include hero.html heading=heading class="bg-none" %}
+{% include hero.html heading=heading class="usa-section--dark bg-none" %}
 
 <div class="container">
   <div class="page-content container--mod grid-row">
diff --git a/_sass/components/_hero.scss b/_sass/components/_hero.scss
index 06b0f4bb5..8e80db31f 100644
--- a/_sass/components/_hero.scss
+++ b/_sass/components/_hero.scss
@@ -3,8 +3,6 @@
 @use '../variables' as *;
 
 .hero {
-  background-color: $navy;
-  color: $white;
   padding-top: $container-spacing-sm;
   padding-bottom: $container-spacing-sm;
 
@@ -32,11 +30,6 @@
       font-size: 1.25rem; // 20px
     }
   }
-
-  &.partners {
-    background-color: color('white');
-    color: color('ink');
-  }
 }
 
 .hero--search {
diff --git a/_sass/components/_layout.scss b/_sass/components/_layout.scss
index 608ba9365..692283e54 100644
--- a/_sass/components/_layout.scss
+++ b/_sass/components/_layout.scss
@@ -28,14 +28,6 @@ article.container,
   }
 }
 
-.usa-nav__primary {
-  order: 0;
-
-  @include at-media-max('desktop') {
-    margin-top: 0;
-  }
-}
-
 .usa-header .usa-nav {
   .usa-search {
     flex-shrink: 0;
@@ -51,28 +43,6 @@ article.container,
     }
   }
 
-  .usa-nav__primary {
-    > .usa-nav__primary-item {
-      > a {
-        line-height: 1.5em;
-        font-size: 0.875rem;
-      }
-      > .usa-nav__link {
-        position: relative;
-        padding: 0;
-
-        &:hover,
-        &.usa-current {
-          box-shadow: inset 0 -4px 0 0 $red;
-
-          &::after {
-            display: none;
-          }
-        }
-      }
-    }
-  }
-
   .one-account-for-govt {
     .container {
       padding-left: 1.5rem;
@@ -81,11 +51,13 @@ article.container,
   }
 }
 
-.usa-header .usa-navbar {
+.usa-header--extended .usa-navbar,
+.usa-header--extended .usa-nav__inner {
   margin-left: 0;
   margin-right: 0;
   padding-left: 0;
   padding-right: 0;
+  max-width: none;
 }
 
 @include at-media('desktop-lg') {
diff --git a/_sass/components/_nav.scss b/_sass/components/_nav.scss
index 24bc7de42..7ae72ac72 100644
--- a/_sass/components/_nav.scss
+++ b/_sass/components/_nav.scss
@@ -33,10 +33,12 @@
   }
 }
 
-.usa-logo {
-  .help-page & {
-    display: flex;
-    align-items: center;
+.top-navigation .usa-logo {
+  display: flex;
+  align-items: center;
+
+  @include at-media('desktop') {
+    margin-top: units(2);
   }
 }
 
@@ -114,87 +116,6 @@
   }
 }
 
-@include at-media('desktop') {
-  .usa-header--extended .usa-nav__primary {
-    margin-left: 0rem;
-  }
-}
-
-@include at-media-max('desktop') {
-  .usa-nav__primary {
-    margin-left: -1rem;
-    margin-right: -1rem;
-    width: auto;
-  }
-
-  .usa-nav__primary button:hover,
-  .usa-nav__primary a:hover {
-    // TODO: Reconcile / backport hover color difference with Login Design System.
-    background-color: $blue-lightest;
-  }
-
-  .usa-nav__primary-item {
-    border-top: 0;
-
-    &::before {
-      // TODO: Reconcile / backport border color difference with Login Design System.
-      background-color: $blue-light;
-      content: '';
-      display: block;
-      height: 1px;
-      margin-left: 1rem;
-      margin-right: 1rem;
-    }
-  }
-
-  .usa-nav__primary .usa-nav__primary-item .usa-accordion__button,
-  .usa-nav__primary .usa-nav__primary-item .usa-accordion__close-button,
-  .usa-nav__primary .usa-nav__submenu-item .usa-accordion__button,
-  .usa-nav__primary .usa-nav__submenu-item .usa-accordion__close-button {
-    background-position: right 1rem center;
-  }
-}
-
-@include at-media('desktop') {
-  .usa-header--extended .usa-navbar.partners-navbar {
-    max-width: 100%;
-  }
-
-  .usa-nav__primary-item + .usa-nav__primary-item {
-    margin-left: 1.5rem;
-  }
-
-  .usa-nav__link__inner {
-    text-transform: none;
-    display: inline-block;
-    padding: 0 0 1rem 0;
-  }
-}
-
-.usa-nav__submenu-item {
-  border-top: none;
-}
-
-.usa-nav__primary button,
-.usa-nav__primary a {
-  @include at-media-max('desktop') {
-    padding-top: 0.9rem;
-    padding-bottom: 0.9rem;
-    line-height: 1.5;
-  }
-}
-
-.usa-nav__primary .usa-nav__submenu-item .usa-current {
-  @include at-media-max('desktop') {
-    background-color: transparent;
-    color: $blue-mid;
-
-    &::after {
-      content: none;
-    }
-  }
-}
-
 .anchor-to-top {
   @include u-display('inline-block');
   @include u-margin-top(4);
diff --git a/_sass/pages/_partners.scss b/_sass/pages/_partners.scss
index 476fbd0a9..4486b154b 100644
--- a/_sass/pages/_partners.scss
+++ b/_sass/pages/_partners.scss
@@ -11,7 +11,7 @@
   }
 }
 
-.partners-logo__img {
+.usa-logo img.partners-logo__img {
   height: 1.7rem;
 }
 
diff --git a/package-lock.json b/package-lock.json
index 6d04c6ac4..47ecd2bd2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,7 +10,7 @@
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@18f/identity-build-sass": "^1.1.0",
-        "@18f/identity-design-system": "^7.0.0",
+        "@18f/identity-design-system": "^7.0.1",
         "@babel/core": "^7.12.9",
         "@babel/preset-env": "^7.12.7",
         "@babel/preset-typescript": "^7.18.6",
@@ -106,9 +106,9 @@
       }
     },
     "node_modules/@18f/identity-design-system": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@18f/identity-design-system/-/identity-design-system-7.0.0.tgz",
-      "integrity": "sha512-rLw1oTK7qzGw+A2B7gYLjEOqX49MOkbe/yyK3M8e+DXpqFOxU1/GjxVzVOr/RuyzhsOeoIT+//xaqPr4dxZA5Q==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/@18f/identity-design-system/-/identity-design-system-7.0.1.tgz",
+      "integrity": "sha512-5KblBGmHLrsLGsF0cCThnkBWG0ZK+sP9NQln4FyEYXs0dzzGr0duhtqnMfGUZr6dj6ziZZjFCTmP8WNlkkpclA==",
       "dependencies": {
         "@uswds/uswds": "^3.4.1"
       },
@@ -13540,9 +13540,9 @@
       }
     },
     "@18f/identity-design-system": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@18f/identity-design-system/-/identity-design-system-7.0.0.tgz",
-      "integrity": "sha512-rLw1oTK7qzGw+A2B7gYLjEOqX49MOkbe/yyK3M8e+DXpqFOxU1/GjxVzVOr/RuyzhsOeoIT+//xaqPr4dxZA5Q==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/@18f/identity-design-system/-/identity-design-system-7.0.1.tgz",
+      "integrity": "sha512-5KblBGmHLrsLGsF0cCThnkBWG0ZK+sP9NQln4FyEYXs0dzzGr0duhtqnMfGUZr6dj6ziZZjFCTmP8WNlkkpclA==",
       "requires": {
         "@uswds/uswds": "^3.4.1"
       }
diff --git a/package.json b/package.json
index 7dc6006aa..5382801aa 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,7 @@
   },
   "dependencies": {
     "@18f/identity-build-sass": "^1.1.0",
-    "@18f/identity-design-system": "^7.0.0",
+    "@18f/identity-design-system": "^7.0.1",
     "@babel/core": "^7.12.9",
     "@babel/preset-env": "^7.12.7",
     "@babel/preset-typescript": "^7.18.6",