diff --git a/src/assets/styles/components/_accordion.scss b/src/assets/styles/components/_accordion.scss
index 3ca8a7e5..8946f786 100644
--- a/src/assets/styles/components/_accordion.scss
+++ b/src/assets/styles/components/_accordion.scss
@@ -72,6 +72,7 @@
 	font-weight: $font-weight-bold;
 	height: rem(54);
 	line-height: normal;
+	margin: calc(2 * var(--border-width)) 0;
 	padding-bottom: rem(14);
 	padding-left: 0;
 	padding-right: 0;
diff --git a/src/assets/styles/components/_button.scss b/src/assets/styles/components/_button.scss
index 32ef3c8c..2cf983c3 100644
--- a/src/assets/styles/components/_button.scss
+++ b/src/assets/styles/components/_button.scss
@@ -153,7 +153,7 @@ button:-moz-focusring {
 	&[aria-pressed="true"],
 	&[aria-checked="true"] {
 		--color: var(--off-white);
-		--background-color: var(--blue-600);
+		--background-color: var(--blue-400);
 		--border-color: var(--background-color);
 
 		--focus-background-color: var(--background-color);
diff --git a/src/assets/styles/components/_menu--home.scss b/src/assets/styles/components/_menu--home.scss
index 23b36f13..9ca34a71 100644
--- a/src/assets/styles/components/_menu--home.scss
+++ b/src/assets/styles/components/_menu--home.scss
@@ -7,9 +7,6 @@
 	--active-color: var(--blue-200);
 	--focus-color: var(--off-white);
 	--focus-background-color: transparent;
-	--focus-box-shadow: 0 0 0 var(--border-width) var(--dark-mint-500), 0 0 0 calc(2 * var(--border-width)) var(--outline-color);
-	--focus-box-shadow: 0 0 0 var(--border-width) var(--outline-color), 0 0 0 calc(2 * var(--border-width)) var(--parent-background-color), 0 0 0 calc(3 * var(--border-width)) var(--outline-color);
-
 }
 
 @include breakpoint-up(md) {
diff --git a/src/assets/styles/components/_menu-button.scss b/src/assets/styles/components/_menu-button.scss
index b48489a9..5b56b74f 100644
--- a/src/assets/styles/components/_menu-button.scss
+++ b/src/assets/styles/components/_menu-button.scss
@@ -15,7 +15,6 @@
 	--active-color: var(--blue-200);
 	--focus-color: var(--off-white);
 	--focus-background-color: transparent;
-	--focus-box-shadow: 0 0 0 var(--border-width) var(--outline-color), 0 0 0 calc(2 * var(--border-width)) var(--parent-background-color), 0 0 0 calc(3 * var(--border-width)) var(--outline-color);
 }
 
 .menu-button__menu {
diff --git a/src/assets/styles/components/_search.scss b/src/assets/styles/components/_search.scss
index 1b934e8f..5705e068 100644
--- a/src/assets/styles/components/_search.scss
+++ b/src/assets/styles/components/_search.scss
@@ -81,8 +81,9 @@
 		--outline-color: var(--blue-600);
 		--hover-color: var(--blue-600);
 		--hover-background-color: var(--blue-150);
-		--active-color: var(--blue-400);
-		--active-background-color: var(--background-color);
+		--active-border-color: var(--blue-50);
+		--active-color: var(--blue-50);
+		--active-background-color: var(--parent-background-color);
 		--focus-color: var(--blue-600);
 		--focus-background-color: var(--background-color);
 		--focus-border-color: var(--blue-50);
diff --git a/src/assets/styles/layouts/_home.scss b/src/assets/styles/layouts/_home.scss
index c6c205cb..329c4980 100644
--- a/src/assets/styles/layouts/_home.scss
+++ b/src/assets/styles/layouts/_home.scss
@@ -45,6 +45,11 @@
 		position: relative;
 		top: rem(-25);
 	}
+
+	.search-form.search-form--inverse .button--search {
+		--active-background-color: var(--blue-500);
+		--active-color: var(--blue-50);
+	}
 }
 
 .home__browse {