diff --git a/resources/skins.vector.styles/SearchBox.less b/resources/skins.vector.styles/SearchBox.less
index 988d3e2..f90646c 100644
--- a/resources/skins.vector.styles/SearchBox.less
+++ b/resources/skins.vector.styles/SearchBox.less
@@ -26,7 +26,7 @@
 	border-radius: @border-radius-base;
 	// `padding-right` equals to `#searchbutton` width below.
 	padding: 5px @width-search-button 5px 0.4em;
-	.box-shadow( @boxShadowWidget );
+	box-shadow: @box-shadow-base;
 	// Match WVUI.
 	font-family: inherit;
 	font-size: @font-size-search-input;
@@ -46,8 +46,8 @@
 	&:focus,
 	#simpleSearch:hover &:focus {
 		outline: 0;
-		border-color: @colorProgressive;
-		.box-shadow( @boxShadowProgressiveFocus );
+		border-color: @border-color-base--focus;
+		box-shadow: @box-shadow-base--focus;
 	}
 
 	.mixin-placeholder( {
diff --git a/resources/skins.vector.styles/SearchBoxLoader.less b/resources/skins.vector.styles/SearchBoxLoader.less
index b9153d2..7379539 100644
--- a/resources/skins.vector.styles/SearchBoxLoader.less
+++ b/resources/skins.vector.styles/SearchBoxLoader.less
@@ -34,7 +34,7 @@
 	color: @color-base--disabled;
 	font-size: @font-size-notification;
 	padding: 0.4em;
-	.box-shadow( @boxShadowWidget );
+	box-shadow: @box-shadow-base;
 	//
 	// Hide text in case it extends beyond the input.
 	overflow: hidden;
diff --git a/resources/skins.vector.styles/Sidebar.less b/resources/skins.vector.styles/Sidebar.less
index b9dd9fa..0e85a63 100644
--- a/resources/skins.vector.styles/Sidebar.less
+++ b/resources/skins.vector.styles/Sidebar.less
@@ -53,9 +53,9 @@
 
 	&:focus {
 		// Next three rules from OOUI, frameless, icon-only button widget.
+		border-color: @border-color-base--focus;
 		outline: 0;
-		border-color: @color-primary;
-		.box-shadow( inset 0 0 0 1px @color-primary );
+		box-shadow: @box-shadow-base--focus;
 	}
 }