diff --git a/src/media/css/colors/light/colors_standard.css b/src/media/css/colors/light/colors_standard.css
index c82c361..4609a45 100644
--- a/src/media/css/colors/light/colors_standard.css
+++ b/src/media/css/colors/light/colors_standard.css
@@ -294,8 +294,8 @@
 }
 
 .btn-secondary {
-	--btn-color: --nav-text-color;
-	--btn-bg: --nav-bg-color;
+	--btn-color: var(--body-bg);
+	--btn-bg: var(--nav-bg-color);
 	--btn-border-color: hsl(210, 7%, 46%);
 	--btn-hover-color: hsl(0, 0%, 100%);
 	--btn-hover-bg: #5d636b;
diff --git a/src/media/css/template.css b/src/media/css/template.css
index 6597bc5..2a093b1 100644
--- a/src/media/css/template.css
+++ b/src/media/css/template.css
@@ -16777,7 +16777,7 @@ body:not(.has-sidebar-right) .site-grid .container-component {
 
 form .form-control,
 form .form-select {
-	border-color: #C7C7C7
+	border-color: var(--input-border-color);
 }
 
 .container-below-topbar {
diff --git a/src/media/css/user.css b/src/media/css/user.css
index 4ce0cf1..c27c9a8 100644
--- a/src/media/css/user.css
+++ b/src/media/css/user.css
@@ -104,6 +104,7 @@
 
 .container-search .icon-search {
 	font-size: 1rem;
+	color: var(--nav-bg-color);
 }
 
 /* Responsive header menu and search layout improvements */