diff --git a/app/views/onboarding/_configuration_modal.html.erb b/app/views/onboarding/_configuration_modal.html.erb
index fbe044dbd23..e38fba6222a 100644
--- a/app/views/onboarding/_configuration_modal.html.erb
+++ b/app/views/onboarding/_configuration_modal.html.erb
@@ -47,7 +47,7 @@ See COPYRIGHT and LICENSE files for more details.
     <div class="onboarding--footer spot-action-bar">
       <div class="spot-action-bar--right">
         <button
-          class="button button_no-margin spot-action-bar--action"
+          class="button button_no-margin spot-action-bar--action spot-modal--cancel-button"
           dynamic-content-modal-close-button
           title=<%= t(:button_close) %>
         ><%= t(:button_close) %></button>
@@ -56,4 +56,3 @@ See COPYRIGHT and LICENSE files for more details.
     </div>
   <% end %>
 </div>
-
diff --git a/app/views/onboarding/_onboarding_video_modal.html.erb b/app/views/onboarding/_onboarding_video_modal.html.erb
index 9a1979a42c1..5dc7cbd56d9 100644
--- a/app/views/onboarding/_onboarding_video_modal.html.erb
+++ b/app/views/onboarding/_onboarding_video_modal.html.erb
@@ -46,7 +46,7 @@ See COPYRIGHT and LICENSE files for more details.
   <div class="onboarding--footer spot-action-bar">
     <div class="spot-action-bar--right">
       <button
-        class="button button_no-margin spot-action-bar--action"
+        class="button button_no-margin spot-action-bar--action spot-modal--cancel-button"
         dynamic-content-modal-close-button
         title=<%= t(:button_close) %>
       ><%= t(:button_close) %></button>
diff --git a/frontend/src/app/features/enterprise/enterprise-modal/enterprise-trial.modal.html b/frontend/src/app/features/enterprise/enterprise-modal/enterprise-trial.modal.html
index bbda2c50a54..dd2fdc51afe 100644
--- a/frontend/src/app/features/enterprise/enterprise-modal/enterprise-trial.modal.html
+++ b/frontend/src/app/features/enterprise/enterprise-modal/enterprise-trial.modal.html
@@ -38,7 +38,7 @@
       <div *ngIf="!context.status || context.cancelled; else mailSubmitted"
            class="spot-action-bar--right">
         <button
-          class="button button_no-margin spot-action-bar--action"
+          class="button button_no-margin spot-action-bar--action spot-modal--cancel-button"
           data-qa-selector="confirmation-modal--cancel"
           (click)="closeModal($event)"
           [textContent]="text.button_cancel"
diff --git a/frontend/src/app/spot/styles/sass/components/action-bar.sass b/frontend/src/app/spot/styles/sass/components/action-bar.sass
index 4af13c58ce5..d6a6fed5ab3 100644
--- a/frontend/src/app/spot/styles/sass/components/action-bar.sass
+++ b/frontend/src/app/spot/styles/sass/components/action-bar.sass
@@ -1,7 +1,6 @@
 .spot-action-bar
   display: grid
   grid-template-columns: 1fr
-  padding: 0 $spot-spacing-1 $spot-spacing-0_75 0
   background-color: $spot-color-basic-gray-6
 
   a.button
@@ -20,7 +19,7 @@
     margin-top: -$spot-spacing-0_25
 
     > .spot-action-bar--action
-      margin: $spot-spacing-1 0 0 $spot-spacing-1
+      margin: $spot-spacing-1 $spot-spacing-1 $spot-spacing-0-75 $spot-spacing-1
 
   @media #{$spot-mq-action-bar-change}
     grid-template-columns: 1fr auto
diff --git a/frontend/src/app/spot/styles/sass/components/modal-overlay.sass b/frontend/src/app/spot/styles/sass/components/modal-overlay.sass
index 05501ca9cba..ccaee58d232 100644
--- a/frontend/src/app/spot/styles/sass/components/modal-overlay.sass
+++ b/frontend/src/app/spot/styles/sass/components/modal-overlay.sass
@@ -31,7 +31,7 @@
     display: block
     margin: 1rem
 
-    @media (min-width: 680px)
+    @media #{$spot-mq-drop-modal-in-context}
       display: none
 
     @media (max-height: 480px)
diff --git a/lookbook/previews/modal_preview/danger_zone.html.erb b/lookbook/previews/modal_preview/danger_zone.html.erb
index 671da13faa0..69a14c91245 100644
--- a/lookbook/previews/modal_preview/danger_zone.html.erb
+++ b/lookbook/previews/modal_preview/danger_zone.html.erb
@@ -12,7 +12,7 @@
     </div>
     <div class="spot-action-bar">
       <div class="spot-action-bar--right">
-        <button name="button" type="button" class="button button_no-margin spot-action-bar--action">Cancel</button>
+        <button name="button" type="button" class="button button_no-margin spot-action-bar--action spot-modal--cancel-button">Cancel</button>
         <button name="button" type="submit" class="button button_no-margin -danger spot-action-bar--action">Continue</button>
       </div>
     </div>