diff --git a/root/static/scss/nav.scss b/root/static/scss/nav.scss
index 5862af868c..f8886a783c 100644
--- a/root/static/scss/nav.scss
+++ b/root/static/scss/nav.scss
@@ -148,7 +148,10 @@ nav.navbar {
     justify-self: end;
     margin: 0;
 
-    button {
+    // Target the icon/toggle buttons only. Dropdown menu items (e.g. the
+    // logout button) must keep Bootstrap's .dropdown-item styling so they
+    // match their <a> siblings instead of getting the icon-button reset.
+    button:not(.dropdown-item) {
         background-color: transparent;
         border: 0;
         padding: 0 6px;
@@ -195,6 +198,13 @@ nav.navbar {
         border-radius: 5px;
         margin-top: 4px;
         position: absolute;
+
+        // <a> dropdown items get a hover underline from the global a:hover
+        // rule; match it on button dropdown items (logout) so they behave
+        // the same as their siblings.
+        button.dropdown-item:hover {
+            text-decoration: underline;
+        }
     }
 
     .login-dropdown {