diff --git a/tools/droiddoc/templates-sdk-dev/assets/css/default.css b/tools/droiddoc/templates-sdk-dev/assets/css/default.css
index 6fef241..43449d4 100644
--- a/tools/droiddoc/templates-sdk-dev/assets/css/default.css
+++ b/tools/droiddoc/templates-sdk-dev/assets/css/default.css
@@ -6632,15 +6632,18 @@
   transition: opacity 200ms linear 200ms;
 }
 
-@media (min-width: 720px) and (max-width: 979px) {
+@media (min-width: 720px) {
   .dac-header-tabs {
     display: inline-block;
   }
-}
 
-@media (min-width: 980px) {
-  .dac-header-tabs {
-    display: inline-block;
+  /* Do not show nav toggle and up-nav button for left nav
+     in Studio docs, when header tabs are visible */
+  body.studio .dac-nav-back-button {
+    display:none;
+  }
+  body.studio .dac-nav-sub {
+    top: 0 !important;
   }
 }
 
@@ -6754,6 +6757,10 @@
   display: inline-block;
 }
 
+body.studio .dac-header-crumbs {
+  display:none;
+}
+
 .dac-header-crumbs.dac-has-content {
   opacity: 1;
 }
@@ -7398,6 +7405,21 @@
   .dac-nav-open #body-content {
     padding-left: 250px;
   }
+
+  /* Do not show nav toggle for Studio on large screens */
+  body.studio .dac-nav-toggle {
+    display:none;
+  }
+  body.studio .dac-header-logo {
+    padding-left:20px;
+  }
+  /* And if the page has no subcomponent, don't show left nav at all */
+  body.studio.None .dac-nav {
+    display: none;
+  }
+  body.studio.None #body-content {
+    padding-left:0;
+  }
 }
 
 .dac-nav-open {