diff --git a/src/public/stylesheets/theme-next/forms.css b/src/public/stylesheets/theme-next/forms.css
index 6c67941da..63ce06230 100644
--- a/src/public/stylesheets/theme-next/forms.css
+++ b/src/public/stylesheets/theme-next/forms.css
@@ -79,7 +79,9 @@ button.btn.btn-success kbd {
  */
 
 :root .icon-action:not(.global-menu-button),
-:root .tn-tool-button {
+:root .tn-tool-button,
+:root .btn-group .tn-tool-button:not(:last-child),
+:root .btn-group .tn-tool-button:last-child {
     width: var(--icon-button-size);
     height: var(--icon-button-size);
     border: unset !important;
@@ -89,6 +91,10 @@ button.btn.btn-success kbd {
     color: var(--icon-button-color);
 }
 
+.btn-group .tn-tool-button + .tn-tool-button {
+    margin-left: 4px !important;
+}
+
 /* The "x" icon button */
 :root .icon-action.bx-x,
 :root .tn-tool-button.bx-x {