diff --git a/src/librustdoc/html/static/main.js b/src/librustdoc/html/static/main.js
index 0f9e7001c15..ba9bcb7af7a 100644
--- a/src/librustdoc/html/static/main.js
+++ b/src/librustdoc/html/static/main.js
@@ -47,6 +47,8 @@
     // 2 for "In Return Types"
     var currentTab = 0;
 
+    var themesWidth = null;
+
     function hasClass(elem, className) {
         if (elem && className && elem.className) {
             var elemClass = elem.className;
@@ -121,10 +123,25 @@
                 sidebar.appendChild(div);
             }
         }
+        var themeChoices = document.getElementById("theme-choices");
+        if (themeChoices) {
+            if (!themesWidth) {
+                var savedState = themeChoices.style.display;
+                themeChoices.style.display = 'block';
+                themesWidth = themeChoices.offsetWidth + 'px';
+                themeChoices.style.display = savedState;
+            }
+            themeChoices.style.position = "fixed";
+            themeChoices.style.width = themesWidth;
+            themeChoices.style.top = '78px';
+            themeChoices.style.left = '250px';
+        }
         document.getElementsByTagName("body")[0].style.marginTop = '45px';
         var themePicker = document.getElementById("theme-picker");
         if (themePicker) {
             themePicker.style.position = "fixed";
+            themePicker.style.top = "50px";
+            themePicker.style.left = "250px";
         }
     }
 
@@ -143,6 +160,15 @@
         var themePicker = document.getElementById("theme-picker");
         if (themePicker) {
             themePicker.style.position = "absolute";
+            themePicker.style.top = null;
+            themePicker.style.left = null;
+        }
+        var themeChoices = document.getElementById("theme-choices");
+        if (themeChoices) {
+            themeChoices.style.position = 'absolute';
+            themeChoices.style.width = null;
+            themeChoices.style.top = null;
+            themeChoices.style.left = null;
         }
     }
 
diff --git a/src/librustdoc/html/static/rustdoc.css b/src/librustdoc/html/static/rustdoc.css
index d2eeb2e15b3..cb6f5d836b8 100644
--- a/src/librustdoc/html/static/rustdoc.css
+++ b/src/librustdoc/html/static/rustdoc.css
@@ -856,6 +856,7 @@ span.since {
 		display: block;
 		border-bottom: 1px solid;
 		border-right: 1px solid;
+		height: 45px;
 	}
 
 	.sidebar-elems {
@@ -875,7 +876,8 @@ span.since {
 	}
 
 	nav.sub {
-		margin: 0 auto;
+		width: calc(100% - 32px);
+		float: right;
 	}
 
 	.content {
@@ -1184,8 +1186,8 @@ kbd {
 
 @media (max-width: 700px) {
 	.theme-picker {
-		left: 109px;
-		top: 7px;
+		left: 10px;
+		top: 54px;
 		z-index: 1;
 	}
 }
diff --git a/src/librustdoc/html/static/themes/dark.css b/src/librustdoc/html/static/themes/dark.css
index 4c6bcab72b7..907a6e4fcb4 100644
--- a/src/librustdoc/html/static/themes/dark.css
+++ b/src/librustdoc/html/static/themes/dark.css
@@ -383,6 +383,6 @@ kbd {
 
 @media (max-width: 700px) {
 	#theme-picker {
-		background: #353535;
+		background: #f0f0f0;
 	}
 }