diff --git a/apps/accessibility/css/themedark.scss b/apps/accessibility/css/themedark.scss
index 185b921fe6..6ee73a0301 100644
--- a/apps/accessibility/css/themedark.scss
+++ b/apps/accessibility/css/themedark.scss
@@ -42,8 +42,7 @@ $color-border-dark: lighten($color-main-background, 14%);
 
 // since svg icons are inverted, revert to white for the header
 .header-right > * {
-	>[class^='icon-'],
-	>[class*=' icon-'] {
+	>[class^='icon-'] {
 		filter: invert(100%);
 	}
 }
diff --git a/core/css/header.scss b/core/css/header.scss
index 159083da91..c1e89b5cc8 100644
--- a/core/css/header.scss
+++ b/core/css/header.scss
@@ -631,7 +631,7 @@ nav[role='navigation'] {
 			width: 155px;
 			cursor: text;
 			background-color: transparent !important;
-			border: 1px solid var(--color-border) !important;
+			border: 1px solid var(--color-primary-text) !important;
 		}
 		&:hover, &:focus, &:active {
 			opacity: 1;
@@ -656,6 +656,9 @@ nav[role='navigation'] {
 			-webkit-appearance: none;
 		}
 	}
+	.icon-search-force-white {
+		@include icon-color('search', 'actions', '#fffffe', 1, true);
+	}
 }
 
 /* Empty content messages in the header e.g. notifications, contacts menu, … */
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 9b558b198e..458af24696 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -105,7 +105,7 @@
 						<?php p($l->t('Search'));?>
 					</label>
 					<input id="searchbox" type="search" name="query"
-						value="" required class="hidden icon-search-white"
+						value="" required class="hidden icon-search-white icon-search-force-white"
 						autocomplete="off">
 					<button class="icon-close-white" type="reset"><span class="hidden-visually"><?php p($l->t('Reset search'));?></span></button>
 				</form>