diff --git buddypress.org/public_html/wp-content/themes/bb-base/style-buddypress.css buddypress.org/public_html/wp-content/themes/bb-base/style-buddypress.css
index 00c4734b3..b3f2c606b 100644
--- buddypress.org/public_html/wp-content/themes/bb-base/style-buddypress.css
+++ buddypress.org/public_html/wp-content/themes/bb-base/style-buddypress.css
@@ -1,14 +1,15 @@
 /* =Site Style
 -------------------------------------------------------------- */
 
-#header {
+#header,
+#wporg-header {
 	background-color: #be3631;
 	border-bottom: 1px solid #9e1611;
 }
 
 #header h1 a,
-#header h1 :link,
-#header h1 :link:hover {
+#wporg-header h1 :link,
+#wporg-header h1 :link:hover {
 	width: 265px;
 	background: url('../buddypress-org/images/buddypress-logo.png') no-repeat 0 0;
 	position: relative;
@@ -49,7 +50,7 @@ div.free-page div.standard {
 -------------------------------------------------------------- */
 
 #nav li a:hover,
-#header #nav li :link:hover {
+#wporg-header #wporg-header-menu li :link:hover {
 	background-color: #cf4944;
 	color: rgba(255,255,255,0.9);
 }
@@ -101,8 +102,8 @@ input.submit:hover {
 @media only screen and (-webkit-min-device-pixel-ratio: 1.5) {
 
 	#header h1 a,
-	#header h1 :link,
-	#header h1 :link:hover {
+	#wporg-header h1 :link,
+	#wporg-header h1 :link:hover {
 		background-image: url('../buddypress-org/images/buddypress-logo-2x.png');
 		background-size: 269px 65px;
 	}
diff --git buddypress.org/public_html/wp-content/themes/bb-base/style.css buddypress.org/public_html/wp-content/themes/bb-base/style.css
index cde2e214d..df462542a 100644
--- buddypress.org/public_html/wp-content/themes/bb-base/style.css
+++ buddypress.org/public_html/wp-content/themes/bb-base/style.css
@@ -45,7 +45,8 @@ body {
 	margin: 0;
 	color: #222;
 }
-#header {
+#header,
+#wporg-header {
 	border-bottom: 1px solid #252;
 	position: fixed;
 	width: 100%;
@@ -66,10 +67,12 @@ body.page-template-page-homepage-php #header {
 	height: 80px;
 	padding: 0;
 }
-#header h1 {
+#header h1,
+#wporg-header h1 {
 	text-indent: -9999px;
 }
-#header h1 a {
+#header h1 a,
+#wporg-header h1 a {
 	margin-top: 8px;
 	width: 220px;
 	height: 62px;
@@ -332,30 +335,34 @@ div.single-post table tr.alt td {
 /* =Navigation
 -------------------------------------------------------------- */
 
-#bb-menu-icon {
+#bb-menu-icon,
+#mobile-menu-button {
 	display: none;
 }
 
-#bb-menu-icon:before {
+#bb-menu-icon:before,
+#mobile-menu-button:before {
 	font: normal 16px/1 'dashicons';
 	color: #000;
 	content: '\f349'
 }
 
-#nav {
+#nav,
+#wporg-header-menu {
 	float: right;
 	margin: 30px 0 0 0;
 	line-height: 20px;
 }
-#nav li {
+#nav li,
+#wporg-header #wporg-header-menu li {
 	display: inline;
 	float: left;
 	margin: 0 3px 0 3px;
 	list-style: none;
 }
 #nav li a,
-#header #nav li :link,
-#header #nav li :visited {
+#wporg-header #wporg-header-menu li :link,
+#wporg-header #wporg-header-menu li :visited {
 	text-decoration: none;
 	color: #fff;
 	height: auto;
@@ -369,14 +376,16 @@ div.single-post table tr.alt td {
 	border-radius: 3px;
 	border: 1px solid transparent;
 }
-#nav li a:hover {
+#nav li a:hover,
+#wporg-header-menu li :link:hover {
 	color: #ddeedd;
 }
 #nav li a.active {
 	color: #fff;
 }
 
-#subnav {
+#subnav,
+body.buddypress.trac #subnav {
 	background: #eee;
 	border-bottom: #ddd solid 1px;
 	font-size: 12px;
@@ -1652,32 +1661,38 @@ body.trac .attachment {
 		float: none;
 		margin: 10px 0;
 	}
-	#bb-menu-icon {
+	#bb-menu-icon,
+	#mobile-menu-button {
 		display: block;
 		position: absolute;
 		right: 0;
 		padding: 33px 20px 33px 33px;
 		text-decoration: none;
 	}
-	#header #nav {
+	#header #nav,
+	#wporg-header #wporg-header-menu {
 		margin: 0;
 		float: right;
 		overflow: visible;
 	}
-	#header #bb-nav {
+	#header #bb-nav,
+	#wporg-header #wporg-header-menu {
 		position: absolute;
 		width: 100%;
 		right: 0;
 		top: 81px;
 		border-bottom: 1px solid #aaa;
 	}
-	#header #bb-nav li {
+	#header #bb-nav li,
+	#wporg-header #wporg-header-menu li {
 		width: 100%;
 		text-align: center;
 		margin: 0;
 		padding: 0;
 	}
-	#header #nav #bb-nav li a {
+	#header #nav #bb-nav li a,
+	#wporg-header #wporg-header-menu li :link,
+	#wporg-header #wporg-header-menu li :visited {
 		display: block;
 		margin: 0;
 		padding: 20px;
@@ -1691,16 +1706,22 @@ body.trac .attachment {
 	}
 	#header #bb-nav,
 	#bbpress-forums .bbp-pagination-count,
-	.bbp-topic-meta {
+	.bbp-topic-meta,
+	#wporg-header #wporg-header-menu {
 		display: none;
 	}
 	#header #nav:hover #bb-nav,
-	#header #nav:focus #bb-nav {
+	#header #nav:focus #bb-nav,
+	#wporg-header #wporg-header-menu.toggled {
 		background-color: #eee;
 		display: block !important;
 	}
+	#wporg-header #wporg-header-menu.toggled {
+		background: #eee;
+	}
 	#header #nav:hover #bb-menu-icon:before,
-	#header #nav:focus #bb-menu-icon:before {
+	#header #nav:focus #bb-menu-icon:before,
+	#wporg-header #mobile-menu-button[aria-expanded="true"]:before {
 		color: #fff;
 	}
 	#wp-admin-bar-my-account img.avatar {
diff --git trac.wordpress.org/templates/buddypress/wporg-header.html trac.wordpress.org/templates/buddypress/wporg-header.html
index bc89b97a3..f53dd4215 100644
--- trac.wordpress.org/templates/buddypress/wporg-header.html
+++ trac.wordpress.org/templates/buddypress/wporg-header.html
@@ -7,19 +7,20 @@
         <dt>Skip to:</dt>
         <dd><a href="#content" title="Skip to content">Content</a></dd>
     </dl>
-    <div id="header">
+    <div id="wporg-header">
         <div id="header-inner">
-            <ul id="nav" class="menu">
-                <li><a href="http://buddypress.org/about/">About</a></li>
-                <li><a href="http://buddypress.org/plugins/">Plugins</a></li>
-                <li><a href="http://buddypress.org/themes/">Themes</a></li>
-                <li><a href="http://codex.buddypress.org/">Documentation</a></li>
-                <li><a href="http://buddypress.org/blog/">Blog</a></li>
-                <li><a href="http://buddypress.org/support/">Support</a></li>
-                <li class="download"><a href="http://buddypress.org/download/">Download</a></li>
+            <button id="mobile-menu-button" aria-expanded="false"><span class="screen-reader-text">Toggle Menu</span></button>
+            <ul id="wporg-header-menu">
+                <li><a href="https://buddypress.org/about/">About</a></li>
+                <li><a href="https://buddypress.org/plugins/">Plugins</a></li>
+                <li><a href="https://buddypress.org/themes/">Themes</a></li>
+                <li><a href="https://codex.buddypress.org/">Documentation</a></li>
+                <li><a href="https://buddypress.org/blog/">Blog</a></li>
+                <li><a href="https://buddypress.org/support/">Support</a></li>
+                <li class="download"><a href="https://buddypress.org/download/">Download</a></li>
             </ul>
 
-            <h1><a href="http://buddypress.org">BuddyPress.org</a></h1>
+            <h1><a href="https://buddypress.org">BuddyPress.org</a></h1>
         </div>
     </div>
 
