diff --git a/src/public/stylesheets/theme-next-dark.css b/src/public/stylesheets/theme-next-dark.css
index 32b53781a..84494d59d 100644
--- a/src/public/stylesheets/theme-next-dark.css
+++ b/src/public/stylesheets/theme-next-dark.css
@@ -26,6 +26,7 @@
     --cmd-button-hover-background-color: #ffffff37;
     --cmd-button-hover-text-color: white;
     --cmd-button-shadow-color: #00000080;
+    --cmd-button-icon-color: white;
     --cmd-button-keyboard-shortcut-background: #0000004d;
     --cmd-button-keyboard-shortcut-color: white;
     --cmd-button-disabled-opacity: .5;
diff --git a/src/public/stylesheets/theme-next-light.css b/src/public/stylesheets/theme-next-light.css
index 842c0d6e6..c61cacfe7 100644
--- a/src/public/stylesheets/theme-next-light.css
+++ b/src/public/stylesheets/theme-next-light.css
@@ -26,6 +26,7 @@
     --cmd-button-hover-background-color: #00000016;
     --cmd-button-hover-text-color: #000;
     --cmd-button-shadow-color: #00000040;
+    --cmd-button-icon-color: black;
     --cmd-button-keyboard-shortcut-background: #00000017;
     --cmd-button-keyboard-shortcut-color: black;
     --cmd-button-disabled-opacity: .5;
diff --git a/src/public/stylesheets/theme-next/forms.css b/src/public/stylesheets/theme-next/forms.css
index b1f610723..b03330146 100644
--- a/src/public/stylesheets/theme-next/forms.css
+++ b/src/public/stylesheets/theme-next/forms.css
@@ -54,6 +54,14 @@ button.btn.btn-success:focus-visible {
     outline: 2px solid var(--input-focus-outline-color);
 }
 
+button.btn.btn-primary span.bx,
+button.btn.btn-secondary span.bx,
+button.btn.btn-sm span.bx,
+button.btn.btn-success span.bx {
+    vertical-align: baseline;
+    color: var(--cmd-button-icon-color);
+}
+
 button.btn.btn-primary kbd,
 button.btn.btn-secondary kbd,
 button.btn.btn-sm kbd,