diff --git a/resources/assets/stylesheets/less/buttons.less b/resources/assets/stylesheets/less/buttons.less
index cf00969810514f67488bc61e2eda51b0485cb5ee..11e609556db8f4763c6cdddcf429a8b9cf7670c3 100644
--- a/resources/assets/stylesheets/less/buttons.less
+++ b/resources/assets/stylesheets/less/buttons.less
@@ -122,7 +122,8 @@ a.button, button.button {
 
 /* Grouped Buttons */
 .button-group {
-    display: inline-block;
+    display: inline-flex;
+    gap: 5px;
     list-style: none;
     margin: 0 0.8em 0 0;
     padding: 0;
@@ -130,13 +131,8 @@ a.button, button.button {
 
     button,
     .button {
-        float: left;
-        margin-left: 5px;
+        margin-left: 0;
         margin-right: 0;
-
-        &:first-of-type {
-            margin-left: 0;
-        }
     }
 }
 
diff --git a/resources/assets/stylesheets/scss/buttons.scss b/resources/assets/stylesheets/scss/buttons.scss
index 57da8373ecf6be01a8e4f8c285cd574bc5321af3..b7235f7d0ca87b8f73905eb7bdcc3977c0dce73f 100644
--- a/resources/assets/stylesheets/scss/buttons.scss
+++ b/resources/assets/stylesheets/scss/buttons.scss
@@ -122,7 +122,8 @@ button.button {
 
 /* Grouped Buttons */
 .button-group {
-    display: inline-block;
+    display: inline-flex;
+    gap: 5px;
     list-style: none;
     margin: 0 0.8em 0 0;
     padding: 0;
@@ -130,13 +131,8 @@ button.button {
 
     button,
     .button {
-        float: left;
-        margin-left: 5px;
+        margin-left: 0;
         margin-right: 0;
-
-        &:first-of-type {
-            margin-left: 0;
-        }
     }
 }