diff --git a/library/stdarch b/library/stdarch
index 863d31b8e1314..eaee02ffdf5d8 160000
--- a/library/stdarch
+++ b/library/stdarch
@@ -1 +1 @@
-Subproject commit 863d31b8e1314e15d124384e5eaa9ab21e12bd79
+Subproject commit eaee02ffdf5d820729ccdf2f95fa08b08c7d24d2
diff --git a/src/librustdoc/html/static/css/rustdoc.css b/src/librustdoc/html/static/css/rustdoc.css
index 78e7c97d71d25..87395f1cff3b6 100644
--- a/src/librustdoc/html/static/css/rustdoc.css
+++ b/src/librustdoc/html/static/css/rustdoc.css
@@ -902,7 +902,6 @@ table,
 	margin-left: 0.25em;
 	padding-left: 0.3125em;
 	padding-right: 23px;
-	border: 0;
 	border-radius: 4px;
 	outline: none;
 	cursor: pointer;
diff --git a/src/librustdoc/html/static/css/themes/ayu.css b/src/librustdoc/html/static/css/themes/ayu.css
index e402b3583f399..85178492a62d8 100644
--- a/src/librustdoc/html/static/css/themes/ayu.css
+++ b/src/librustdoc/html/static/css/themes/ayu.css
@@ -26,10 +26,6 @@ h4 {
 	border: none;
 }
 
-.in-band {
-	background-color: #0f1419;
-}
-
 .invisible {
 	background: rgba(0, 0, 0, 0);
 }
@@ -234,14 +230,11 @@ details.undocumented > summary::before {
 	filter: invert(100%);
 }
 
-#crate-search, .search-input {
+#theme-picker, #settings-menu, #help-button,
+#crate-search, .search-input, .search-input::placeholder {
 	background-color: #141920;
 	border-color: #424c57;
-	color: #c5c5c5;
-}
-
-.search-input {
-	color: #ffffff;
+	color: grey;
 }
 
 .module-item .stab,
@@ -531,16 +524,14 @@ kbd {
 	box-shadow: inset 0 -1px 0 #5c6773;
 }
 
-#theme-picker, #settings-menu, #help-button {
-	border-color: #5c6773;
-	background-color: #0f1419;
-	color: #fff;
-}
-
 #theme-picker > img, #settings-menu > img {
 	filter: invert(100);
 }
 
+.sub-container img {
+	opacity: 50%;
+}
+
 #copy-path {
 	color: #fff;
 }
diff --git a/src/librustdoc/html/static/css/themes/dark.css b/src/librustdoc/html/static/css/themes/dark.css
index 0a56055b8cbf6..cbbb9e33a4c79 100644
--- a/src/librustdoc/html/static/css/themes/dark.css
+++ b/src/librustdoc/html/static/css/themes/dark.css
@@ -13,10 +13,6 @@ h2, h3, h4 {
 	border-bottom-color: #d2d2d2;
 }
 
-.in-band {
-	background-color: #353535;
-}
-
 .invisible {
 	background: rgba(0, 0, 0, 0);
 }
@@ -214,14 +210,15 @@ details.undocumented > summary::before {
 	filter: invert(100%);
 }
 
+#theme-picker, #settings-menu, #help-button,
 #crate-search, .search-input {
-	color: #111;
-	background-color: #f0f0f0;
-	border-color: #000;
+	color: white;
+	background-color: #353535;
+	border-color: #505050;
 }
 
-.search-input {
-	border-color: #e0e0e0;
+#theme-picker > img, #settings-menu > img {
+	filter: invert(100%);
 }
 
 .search-input:focus {
@@ -408,12 +405,6 @@ kbd {
 	box-shadow: inset 0 -1px 0 #c6cbd1;
 }
 
-#theme-picker, #settings-menu, #help-button {
-	border-color: #e0e0e0;
-	background: #f0f0f0;
-	color: #000;
-}
-
 #theme-picker:hover, #theme-picker:focus,
 #settings-menu:hover, #settings-menu:focus,
 #help-button:hover, #help-button:focus {
diff --git a/src/librustdoc/html/static/css/themes/light.css b/src/librustdoc/html/static/css/themes/light.css
index dc1715b2a78f3..dcdc27fadf275 100644
--- a/src/librustdoc/html/static/css/themes/light.css
+++ b/src/librustdoc/html/static/css/themes/light.css
@@ -15,10 +15,6 @@ h2, h3, h4 {
 	border-bottom-color: #DDDDDD;
 }
 
-.in-band {
-	background-color: white;
-}
-
 .invisible {
 	background: rgba(0, 0, 0, 0);
 }
@@ -208,8 +204,15 @@ details.undocumented > summary::before {
 	color: #999;
 }
 
+#theme-picker:hover, #theme-picker:focus,
+#settings-menu:hover, #settings-menu:focus,
+#help-button:hover, #help-button:focus {
+	border-color: #717171;
+}
+
+#theme-picker, #settings-menu, #help-button,
 #crate-search, .search-input {
-	color: #555;
+	color: black;
 	background-color: white;
 	border-color: #e0e0e0;
 }
@@ -394,17 +397,6 @@ kbd {
 	box-shadow: inset 0 -1px 0 #c6cbd1;
 }
 
-#theme-picker, #settings-menu, #help-button {
-	border-color: #e0e0e0;
-	background-color: #fff;
-}
-
-#theme-picker:hover, #theme-picker:focus,
-#settings-menu:hover, #settings-menu:focus,
-#help-button:hover, #help-button:focus {
-	border-color: #717171;
-}
-
 #copy-path {
 	color: #999;
 }
diff --git a/src/test/rustdoc-gui/headers-color.goml b/src/test/rustdoc-gui/headers-color.goml
index cf9caa2d5866a..a55d20299111c 100644
--- a/src/test/rustdoc-gui/headers-color.goml
+++ b/src/test/rustdoc-gui/headers-color.goml
@@ -19,10 +19,13 @@ assert-css: (
 )
 assert-css: (
     ".impl .code-header",
-    {"color": "rgb(230, 225, 207)", "background-color": "rgb(15, 20, 25)"},
+    {"color": "rgb(230, 225, 207)", "background-color": "rgba(0, 0, 0, 0)"},
     ALL,
 )
 
+compare-elements-css: ("#settings-menu", "#help-button", ["border-color", "background-color", "color"])
+compare-elements-css: ("#settings-menu", ".search-input", ["border-color", "color"])
+
 goto: file://|DOC_PATH|/test_docs/struct.Foo.html#impl
 assert-css: (
     "#impl",
@@ -58,7 +61,7 @@ assert-css: (
 )
 assert-css: (
     ".impl .code-header",
-    {"color": "rgb(221, 221, 221)", "background-color": "rgb(53, 53, 53)"},
+    {"color": "rgb(221, 221, 221)", "background-color": "rgba(0, 0, 0, 0)"},
     ALL,
 )
 
@@ -75,6 +78,9 @@ assert-css: (
     ALL,
 )
 
+compare-elements-css: ("#settings-menu", "#help-button", ["border-color", "background-color", "color"])
+compare-elements-css: ("#settings-menu", ".search-input", ["border-color", "color"])
+
 goto: file://|DOC_PATH|/test_docs/index.html
 assert-css: (".small-section-header a", {"color": "rgb(221, 221, 221)"}, ALL)
 
@@ -95,10 +101,13 @@ assert-css: (
 )
 assert-css: (
     ".impl .code-header",
-    {"color": "rgb(0, 0, 0)", "background-color": "rgb(255, 255, 255)"},
+    {"color": "rgb(0, 0, 0)", "background-color": "rgba(0, 0, 0, 0)"},
     ALL,
 )
 
+compare-elements-css: ("#settings-menu", "#help-button", ["border-color", "background-color", "color"])
+compare-elements-css: ("#settings-menu", ".search-input", ["border-color", "color"])
+
 goto: file://|DOC_PATH|/test_docs/struct.Foo.html#impl
 assert-css: ("#impl", {"color": "rgb(0, 0, 0)", "background-color": "rgb(253, 255, 211)"})