diff --git a/app/assets/javascripts/work_items/components/shared/work_item_sidebar_dropdown_widget_with_edit.vue b/app/assets/javascripts/work_items/components/shared/work_item_sidebar_dropdown_widget_with_edit.vue
index 1fd0f05643152a0c90d7ac4ed095c7f943b05401..1d93af8c138ba4a289f04c7eb5d1b4adf15e7686 100644
--- a/app/assets/javascripts/work_items/components/shared/work_item_sidebar_dropdown_widget_with_edit.vue
+++ b/app/assets/javascripts/work_items/components/shared/work_item_sidebar_dropdown_widget_with_edit.vue
@@ -164,7 +164,7 @@ export default {
         data-testid="edit-button"
         category="tertiary"
         size="small"
-        class="gl-ml-auto gl-mr-2"
+        class="gl-ml-auto"
         :disabled="updateInProgress"
         @click="isEditing = true"
         >{{ $options.i18n.editButtonLabel }}</gl-button
@@ -177,7 +177,6 @@ export default {
           data-testid="apply-button"
           category="tertiary"
           size="small"
-          class="gl-mr-2"
           :disabled="updateInProgress"
           @click="isEditing = false"
           >{{ $options.i18n.applyButtonLabel }}</gl-button
diff --git a/app/assets/javascripts/work_items/components/work_item_due_date_with_edit.vue b/app/assets/javascripts/work_items/components/work_item_due_date_with_edit.vue
index 9ad53a5b3794eba92ec34c5d0999af5ba2d6d0bc..ac5091555260faedfff4f656809956b02496d151 100644
--- a/app/assets/javascripts/work_items/components/work_item_due_date_with_edit.vue
+++ b/app/assets/javascripts/work_items/components/work_item_due_date_with_edit.vue
@@ -219,7 +219,7 @@ export default {
         data-testid="edit-button"
         category="tertiary"
         size="small"
-        class="gl-ml-auto gl-mr-2"
+        class="gl-ml-auto"
         :disabled="isUpdating"
         @click="expandWidget"
         >{{ __('Edit') }}</gl-button
@@ -234,7 +234,6 @@ export default {
           data-testid="apply-button"
           category="tertiary"
           size="small"
-          class="gl-mr-2"
           :disabled="isUpdating"
           @click="collapseWidget"
           >{{ __('Apply') }}</gl-button
diff --git a/app/assets/javascripts/work_items/components/work_item_parent_with_edit.vue b/app/assets/javascripts/work_items/components/work_item_parent_with_edit.vue
index 9864e87736e79a915b2a931f6b8ac714f28ee4d0..9fb7a2c018a34be5b04cacdd679a9aaf10d75e7c 100644
--- a/app/assets/javascripts/work_items/components/work_item_parent_with_edit.vue
+++ b/app/assets/javascripts/work_items/components/work_item_parent_with_edit.vue
@@ -224,7 +224,7 @@ export default {
         data-testid="edit-parent"
         category="tertiary"
         size="small"
-        class="gl-ml-auto gl-mr-2"
+        class="gl-ml-auto"
         :disabled="updateInProgress"
         @click="isEditing = true"
         >{{ __('Edit') }}</gl-button
@@ -237,7 +237,6 @@ export default {
           data-testid="apply-parent"
           category="tertiary"
           size="small"
-          class="gl-mr-2"
           :disabled="updateInProgress"
           @click="isEditing = false"
           >{{ __('Apply') }}</gl-button
diff --git a/app/assets/stylesheets/page_bundles/work_items.scss b/app/assets/stylesheets/page_bundles/work_items.scss
index c536d65f1fa7a6df665dda835771f0c94bfcabd5..172ea7ee61f01e9b48f1e9d9d361f3dd72067dbd 100644
--- a/app/assets/stylesheets/page_bundles/work_items.scss
+++ b/app/assets/stylesheets/page_bundles/work_items.scss
@@ -177,6 +177,7 @@ $work-item-overview-gap-width: 2rem;
       top: calc(#{$calc-application-header-height} + #{$work-item-sticky-header-height});
       height: calc(#{$calc-application-viewport-height} - #{$work-item-sticky-header-height});
       margin-bottom: calc(#{$content-wrapper-padding} * -1);
+      padding-inline: 0.5rem;
       position: sticky;
       overflow-y: auto;
       overflow-x: hidden;
diff --git a/ee/app/assets/javascripts/work_items/components/work_item_health_status_with_edit.vue b/ee/app/assets/javascripts/work_items/components/work_item_health_status_with_edit.vue
index b46a93be1a014a49e79f88e3e93240955255a9a2..2618ef2c789634fa7dd2773f1d3489edaa254efe 100644
--- a/ee/app/assets/javascripts/work_items/components/work_item_health_status_with_edit.vue
+++ b/ee/app/assets/javascripts/work_items/components/work_item_health_status_with_edit.vue
@@ -139,7 +139,7 @@ export default {
         data-testid="edit-health-status"
         category="tertiary"
         size="small"
-        class="gl-ml-auto gl-mr-2"
+        class="gl-ml-auto"
         :disabled="updateInProgress"
         @click="isEditing = true"
         >{{ __('Edit') }}</gl-button
diff --git a/ee/app/assets/javascripts/work_items/components/work_item_weight_with_edit.vue b/ee/app/assets/javascripts/work_items/components/work_item_weight_with_edit.vue
index 795db8c4b98620dfaa8ede617350a155e64d86e5..3afedea7b5c4dad3795dbb83b68c210b03a15168 100644
--- a/ee/app/assets/javascripts/work_items/components/work_item_weight_with_edit.vue
+++ b/ee/app/assets/javascripts/work_items/components/work_item_weight_with_edit.vue
@@ -140,7 +140,6 @@ export default {
         data-testid="edit-weight"
         category="tertiary"
         size="small"
-        class="gl-mr-2"
         @click="isEditing = true"
         >{{ __('Edit') }}</gl-button
       >