diff --git a/addons/rose/addon/components/rose/form/actions/edit-toggle/index.hbs b/addons/rose/addon/components/rose/form/actions/edit-toggle/index.hbs
index 7ef8dfd21..05a0d09b8 100644
--- a/addons/rose/addon/components/rose/form/actions/edit-toggle/index.hbs
+++ b/addons/rose/addon/components/rose/form/actions/edit-toggle/index.hbs
@@ -3,10 +3,10 @@
   SPDX-License-Identifier: MPL-2.0
 }}
 
-<div class='rose-form-actions' ...attributes>
+<Hds::ButtonSet class='rose-form-actions' ...attributes>
   <Hds::Button
     @text={{@enableEditText}}
     @color='secondary'
     {{on 'click' @enableEdit}}
   />
-</div>
\ No newline at end of file
+</Hds::ButtonSet>
\ No newline at end of file
diff --git a/addons/rose/addon/styles/hds/overrides.scss b/addons/rose/addon/styles/hds/overrides.scss
index 34d0fe793..2b88d409e 100644
--- a/addons/rose/addon/styles/hds/overrides.scss
+++ b/addons/rose/addon/styles/hds/overrides.scss
@@ -3,16 +3,11 @@
  * SPDX-License-Identifier: MPL-2.0
  */
 
-// field bottom margin (HDS leaves this to implementers)
+// field and button bottom margin (HDS leaves this to implementers)
 [class*='hds-form-field--layout'],
-[class*='hds-form-group--layout'] {
-  margin-bottom: 1.5rem;
-}
-
+[class*='hds-form-group--layout'],
 .hds-button-set {
-  .hds-button {
-    margin-bottom: 1.5rem;
-  }
+  margin-bottom: 1.5rem;
 }
 
 /* stylelint-disable selector-class-pattern */