diff --git a/_includes/header.html b/_includes/header.html
index c1ee30f1a..a313128f0 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -88,19 +88,17 @@
             {% endfor %}
           </ul>
         </li>
-
       </ul>
     </div>
     <div class="usa-nav__secondary">
       <div class="usa-nav__secondary-container">
         <ul class="usa-nav__secondary-links">
-          <li class="usa-nav__secondary-item bold">
+          <li class="usa-nav__secondary-item bold sign-in-wrapper">
             <span class="font-sans-md">{% t nav.sign_in %}</span>
-            <button tabindex="-1" class="usa-button--small sign-in-logo sign-in-logo-padding">
-              <a href="{% if site.lang != 'en' %}https://secure.login.gov/{{site.lang}}/{% else %}https://secure.login.gov/{% endif %}" title="Sign In" aria-label="Sign in">
-                <img src="{{ site.baseurl }}/assets/img/logo_sign_in.svg" alt="login.gov">
-              </a>
-            </button>
+            <span class="usa-button--small sign-in-logo sign-in-logo-padding">
+              <a href="https://secure.login.gov/{% if site.lang != 'en' %}{{site.lang}}{% endif %}"
+                title="Login.gov" aria-label="Login.gov" tabindex="0">Login.gov</a>
+            </span>
           </li>
         </ul>
         <form class="usa-search usa-search--small" id="search_form" action="https://search.usa.gov/search" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
diff --git a/_sass/components/_nav.scss b/_sass/components/_nav.scss
index 11251ddc5..ad41218b6 100644
--- a/_sass/components/_nav.scss
+++ b/_sass/components/_nav.scss
@@ -4,16 +4,41 @@
   }
 }
 
+.sign-in-wrapper {
+  display: flex !important;
+  align-items: center;
+}
+
 .sign-in-logo {
   background-color: transparent;
   width: 103px;
   height: 27px;
-  padding: 6px;
-  border-color: map-get($site-palette, 'site-light-blue');
+  padding: 7px 6px 6px;
+  margin-left: 0.2rem;
+  border: 1px solid map-get($site-palette, 'site-light-blue');
+  display: flex;
+  justify-content: center;
+  align-items: center;
+
+  &:hover {
+    border-color: $blue;
+  }
+
+  a {
+    font-size: 1.28rem;
+    color: transparent;
+    background: url(../img/logo_sign_in.svg) center/contain no-repeat;
+
+    &:hover {
+      color: transparent;
+    }
+  }
 }
 
 .usa-search [type=search] {
   height: 2rem;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
 }
 
 .logo {