diff --git a/web-client/src/styles/buttons.scss b/web-client/src/styles/buttons.scss
index da4eb298672..510c0438d50 100644
--- a/web-client/src/styles/buttons.scss
+++ b/web-client/src/styles/buttons.scss
@@ -71,13 +71,12 @@ button:disabled {
   }
 
   &.ustc-button--unstyled {
-    margin-top: 0.75rem;
-    margin-bottom: 0.75rem;
+    padding: 0.75rem 0;
     line-height: normal;
     text-align: center;
 
-    &.margin-top-0 {
-      margin-top: 0;
+    &.padding-top-0 {
+      padding-top: 0;
     }
   }
 
diff --git a/web-client/src/styles/custom.scss b/web-client/src/styles/custom.scss
index 785d494e645..e4ba2491be4 100644
--- a/web-client/src/styles/custom.scss
+++ b/web-client/src/styles/custom.scss
@@ -38,13 +38,6 @@ hr {
   &.underlined {
     border-bottom: 1px solid color($theme-color-base-lighter);
   }
-
-  /* big screens */
-  @media only screen and (min-width: $medium-screen) {
-    &.flex-justify-space-between {
-      justify-content: space-between;
-    }
-  }
 }
 
 .max-width-200 {
diff --git a/web-client/src/ustc-ui/Modal/ConfirmModal.tsx b/web-client/src/ustc-ui/Modal/ConfirmModal.tsx
index bdf5291e004..69bf74ef20b 100644
--- a/web-client/src/ustc-ui/Modal/ConfirmModal.tsx
+++ b/web-client/src/ustc-ui/Modal/ConfirmModal.tsx
@@ -98,7 +98,7 @@ export const ConfirmModal = connect<ConfirmModalProps, typeof confirmModalDeps>(
                 <Button
                   iconRight
                   link
-                  className="text-no-underline hide-on-mobile float-right margin-right-0 margin-top-0"
+                  className="text-no-underline hide-on-mobile float-right margin-right-0 padding-top-0"
                   icon="times-circle"
                   onClick={event => {
                     event.stopPropagation();
diff --git a/web-client/src/views/CreateOrder/CreateOrder.tsx b/web-client/src/views/CreateOrder/CreateOrder.tsx
index 7a30f44cb39..14bf982432f 100644
--- a/web-client/src/views/CreateOrder/CreateOrder.tsx
+++ b/web-client/src/views/CreateOrder/CreateOrder.tsx
@@ -86,7 +86,7 @@ export const CreateOrder = connect(
                 {createOrderHelper.showAddDocketNumbersButton && (
                   <Button
                     link
-                    className="margin-top-0"
+                    className="padding-top-0"
                     data-testid="add-docket-number-btn"
                     icon={createOrderHelper.addDocketNumbersButtonIcon}
                     id="add-docket-numbers-btn"
diff --git a/web-client/src/views/Header/Header.tsx b/web-client/src/views/Header/Header.tsx
index 47baaa24930..dd6f640f604 100644
--- a/web-client/src/views/Header/Header.tsx
+++ b/web-client/src/views/Header/Header.tsx
@@ -305,7 +305,7 @@ export const Header = connect(
                   <Button
                     iconRight
                     link
-                    className="usa-nav__close float-right margin-right-0 margin-top-0"
+                    className="usa-nav__close float-right margin-right-0 padding-top-0"
                     icon="times-circle"
                     onClick={() => toggleMobileMenuSequence()}
                   >
diff --git a/web-client/src/views/Login/Login.tsx b/web-client/src/views/Login/Login.tsx
index 9bd94ec12dc..6a45d00d17f 100644
--- a/web-client/src/views/Login/Login.tsx
+++ b/web-client/src/views/Login/Login.tsx
@@ -119,7 +119,7 @@ export const Login = connect(
                     <span>
                       Don&apos;t have an account?{' '}
                       <Button
-                        className="margin-top-0"
+                        className="padding-top-0"
                         link={true}
                         type="button"
                         onClick={e => {
diff --git a/web-client/src/views/ModalDialog.tsx b/web-client/src/views/ModalDialog.tsx
index 7abeb47aa03..dae91d6f0a0 100644
--- a/web-client/src/views/ModalDialog.tsx
+++ b/web-client/src/views/ModalDialog.tsx
@@ -127,7 +127,7 @@ export const ModalDialog = ({
                     <Button
                       iconRight
                       link
-                      className="text-no-underline hide-on-mobile float-right margin-right-0 margin-top-0"
+                      className="text-no-underline hide-on-mobile float-right margin-right-0 padding-top-0"
                       data-testid="close-modal-button"
                       icon="times-circle"
                       id="close-modal-button"
diff --git a/web-client/src/views/ScanBatchPreviewer.tsx b/web-client/src/views/ScanBatchPreviewer.tsx
index f14e56f7782..79f0f74493a 100644
--- a/web-client/src/views/ScanBatchPreviewer.tsx
+++ b/web-client/src/views/ScanBatchPreviewer.tsx
@@ -279,7 +279,7 @@ export const ScanBatchPreviewer = connect(
           <div className="padding-top-2">
             <Button
               link
-              className="red-warning push-right margin-bottom-1 margin-top-0"
+              className="red-warning push-right margin-bottom-1 padding-top-0"
               data-testid="remove-pdf"
               onClick={() => {
                 openConfirmDeletePDFModalSequence();
diff --git a/web-client/src/views/StartCaseUpdated/PetitionFactOrReason.tsx b/web-client/src/views/StartCaseUpdated/PetitionFactOrReason.tsx
index 2f4c0b6e42e..3eb26be4d41 100644
--- a/web-client/src/views/StartCaseUpdated/PetitionFactOrReason.tsx
+++ b/web-client/src/views/StartCaseUpdated/PetitionFactOrReason.tsx
@@ -75,7 +75,7 @@ export const PetitionFactOrReason = connect<
               {factOrReasonCount > 0 && (
                 <Button
                   link
-                  className="reason-button remove-fact-reason-button flex-align-self-center"
+                  className="reason-button remove-fact-reason-button"
                   icon="times"
                   onClick={() =>
                     removeFactOrReasonSequence({
diff --git a/web-client/src/views/StartCaseUpdated/UpdatedFilePetitionStep3.tsx b/web-client/src/views/StartCaseUpdated/UpdatedFilePetitionStep3.tsx
index 3efac9e155c..fe586b2969a 100644
--- a/web-client/src/views/StartCaseUpdated/UpdatedFilePetitionStep3.tsx
+++ b/web-client/src/views/StartCaseUpdated/UpdatedFilePetitionStep3.tsx
@@ -169,7 +169,7 @@ export const UpdatedFilePetitionStep3 = connect(
                 {irsNoticeUploadFormInfo.length < 5 && (
                   <Button
                     link
-                    className={classNames('margin-top-0', 'text-left')}
+                    className={classNames('padding-top-0', 'text-left')}
                     data-testid="add-another-irs-notice-button"
                     onClick={() => addAnotherIrsNoticeToFormSequence()}
                   >
diff --git a/web-client/src/views/TrialSessionDetail/ServeThirtyDayNoticeModal.tsx b/web-client/src/views/TrialSessionDetail/ServeThirtyDayNoticeModal.tsx
index 1cd30d77823..0e8339cd7c7 100644
--- a/web-client/src/views/TrialSessionDetail/ServeThirtyDayNoticeModal.tsx
+++ b/web-client/src/views/TrialSessionDetail/ServeThirtyDayNoticeModal.tsx
@@ -30,7 +30,7 @@ const component = ({
             <Button
               iconRight
               link
-              className="text-no-underline hide-on-mobile float-right margin-right-0 margin-top-0"
+              className="text-no-underline hide-on-mobile float-right margin-right-0 padding-top-0"
               icon="times-circle"
               onClick={() => closeModalSequence()}
             >
diff --git a/web-client/src/views/TrialSessionDetail/TrialSessionInformation.tsx b/web-client/src/views/TrialSessionDetail/TrialSessionInformation.tsx
index 75c5cb5a458..4532d5c36d5 100644
--- a/web-client/src/views/TrialSessionDetail/TrialSessionInformation.tsx
+++ b/web-client/src/views/TrialSessionDetail/TrialSessionInformation.tsx
@@ -90,7 +90,7 @@ export const TrialSessionInformation = connect(
     return (
       <>
         <div className="grid-container padding-x-0">
-          <div className="grid-row flex-justify-space-between">
+          <div className="grid-row">
             <div className="grid-col-auto">
               <h1>
                 Session Information
@@ -115,7 +115,7 @@ export const TrialSessionInformation = connect(
                 )}
               </h1>
             </div>
-            <div className="grid-col-fill tablet:grid-col-auto">
+            <div className="grid-col-fill display-flex flex-justify-end">
               {formattedTrialSessionDetails.canDelete && (
                 <Button
                   link
diff --git a/web-client/src/views/WorkQueue/RecentMessages.tsx b/web-client/src/views/WorkQueue/RecentMessages.tsx
index c7e85245bfc..b3cb6eb4963 100644
--- a/web-client/src/views/WorkQueue/RecentMessages.tsx
+++ b/web-client/src/views/WorkQueue/RecentMessages.tsx
@@ -5,7 +5,12 @@ import React from 'react';
 export const RecentMessages = () => {
   return (
     <div className="margin-top-4">
-      <Button link className="float-right" href="/messages/my/inbox">
+      <Button
+        link
+        className="float-right"
+        href="/messages/my/inbox"
+        overrideMargin="margin-0"
+      >
         View All Messages
       </Button>