diff --git a/tools/droiddoc/templates-sdk-dyn/assets/css/default.css b/tools/droiddoc/templates-sdk-dyn/assets/css/default.css
index b1c7dcf..e26aec6 100644
--- a/tools/droiddoc/templates-sdk-dyn/assets/css/default.css
+++ b/tools/droiddoc/templates-sdk-dyn/assets/css/default.css
@@ -4156,7 +4156,6 @@
 }
 
 .logo a {
-  width:123px;
   float:left;
 }
 
@@ -4169,12 +4168,13 @@
 }
 
 
-#header-wrap .logo-wear {
+#header-wrap .logo.wear-logo {
   width:220px;
   margin:0;
+  padding:0;
   margin-bottom:22px;
 }
-#header-wrap .logo-wear img {
+#header-wrap .logo.wear-logo img {
   padding:0 0 0 10px;
 }
 
diff --git a/tools/droiddoc/templates-sdk-dyn/assets/js/docs.js b/tools/droiddoc/templates-sdk-dyn/assets/js/docs.js
index 09d5f7a..e6befe3 100644
--- a/tools/droiddoc/templates-sdk-dyn/assets/js/docs.js
+++ b/tools/droiddoc/templates-sdk-dyn/assets/js/docs.js
@@ -564,6 +564,12 @@
   }
   // Add the primary horizontal nav
   var $selectedFirstNav = $("div#header-wrap ul.nav-x a.selected").clone().removeClass("selected");
+  // If there's no header nav item, use the logo link and title from alt text
+  if ($selectedFirstNav.length < 1) {
+    $selectedFirstNav = $("<a>")
+        .attr('href', $("div#header .logo a").attr('href'))
+        .text($("div#header .logo img").attr('alt'));
+  }
   $breadcrumbUl.prepend($("<li>").append($selectedFirstNav));
 }