diff --git a/src/imagings/requests/NewImagingRequest.tsx b/src/imagings/requests/NewImagingRequest.tsx
index 7fad9ace49..dc03c7bff8 100644
--- a/src/imagings/requests/NewImagingRequest.tsx
+++ b/src/imagings/requests/NewImagingRequest.tsx
@@ -199,7 +199,7 @@ const NewImagingRequest = () => {
           />
         </div>
         <div className="row float-right">
-          <div className="btn-group btn-group-lg mt-3">
+          <div className="btn-group btn-group-lg mt-3 mr-3">
             <Button className="mr-2" color="success" onClick={onSave}>
               {t('actions.save')}
             </Button>
diff --git a/src/incidents/report/ReportIncident.tsx b/src/incidents/report/ReportIncident.tsx
index c04403e10f..75dcc180b8 100644
--- a/src/incidents/report/ReportIncident.tsx
+++ b/src/incidents/report/ReportIncident.tsx
@@ -133,7 +133,7 @@ const ReportIncident = () => {
       </Row>
 
       <div className="row float-right">
-        <div className="btn-group btn-group-lg mt-3">
+        <div className="btn-group btn-group-lg mt-3 mr-3">
           <Button className="mr-2" color="success" onClick={onSave}>
             {t('incidents.actions.report')}
           </Button>
diff --git a/src/incidents/view/ViewIncidentDetails.tsx b/src/incidents/view/ViewIncidentDetails.tsx
index 56f8690c29..bdf05eb198 100644
--- a/src/incidents/view/ViewIncidentDetails.tsx
+++ b/src/incidents/view/ViewIncidentDetails.tsx
@@ -40,12 +40,7 @@ function ViewIncidentDetails(props: Props) {
 
     if (permissions.includes(Permissions.ResolveIncident)) {
       buttons.push(
-        <Button
-          className="mr-2"
-          onClick={onResolve}
-          color="primary"
-          key="incidents.reports.resolve"
-        >
+        <Button onClick={onResolve} color="primary" key="incidents.reports.resolve">
           {t('incidents.reports.resolve')}
         </Button>,
       )
@@ -134,7 +129,7 @@ function ViewIncidentDetails(props: Props) {
       </Row>
       {data.resolvedOn === undefined && (
         <div className="row float-right">
-          <div className="btn-group btn-group-lg mt-3">{getButtons()}</div>
+          <div className="btn-group btn-group-lg mt-3 mr-3">{getButtons()}</div>
         </div>
       )}
     </>
diff --git a/src/labs/ViewLab.tsx b/src/labs/ViewLab.tsx
index c9c5f05f31..9088918964 100644
--- a/src/labs/ViewLab.tsx
+++ b/src/labs/ViewLab.tsx
@@ -248,7 +248,7 @@ const ViewLab = () => {
           )}
           {isEditable && (
             <div className="row float-right">
-              <div className="btn-group btn-group-lg mt-3">{getButtons()}</div>
+              <div className="btn-group btn-group-lg mt-3 mr-3">{getButtons()}</div>
             </div>
           )}
         </form>
diff --git a/src/labs/requests/NewLabRequest.tsx b/src/labs/requests/NewLabRequest.tsx
index d28bcead71..0dfbffdccb 100644
--- a/src/labs/requests/NewLabRequest.tsx
+++ b/src/labs/requests/NewLabRequest.tsx
@@ -124,7 +124,7 @@ const NewLabRequest = () => {
           />
         </div>
         <div className="row float-right">
-          <div className="btn-group btn-group-lg mt-3">
+          <div className="btn-group btn-group-lg mt-3 mr-3">
             <Button className="mr-2" color="success" onClick={onSave}>
               {t('labs.requests.save')}
             </Button>
diff --git a/src/medications/ViewMedication.tsx b/src/medications/ViewMedication.tsx
index c54b9a2c1c..fdc7d98c0c 100644
--- a/src/medications/ViewMedication.tsx
+++ b/src/medications/ViewMedication.tsx
@@ -307,7 +307,7 @@ const ViewMedication = () => {
           </Row>
           {isEditable && (
             <div className="row float-right">
-              <div className="btn-group btn-group-lg mt-3">{getButtons()}</div>
+              <div className="btn-group btn-group-lg mt-3 mr-3">{getButtons()}</div>
             </div>
           )}
         </form>
diff --git a/src/medications/requests/NewMedicationRequest.tsx b/src/medications/requests/NewMedicationRequest.tsx
index 8ca68f1cfc..15fcdc6737 100644
--- a/src/medications/requests/NewMedicationRequest.tsx
+++ b/src/medications/requests/NewMedicationRequest.tsx
@@ -225,7 +225,7 @@ const NewMedicationRequest = () => {
           />
         </div>
         <div className="row float-right">
-          <div className="btn-group btn-group-lg mt-3">
+          <div className="btn-group btn-group-lg mt-3 mr-3">
             <Button className="mr-2" color="success" onClick={onSave}>
               {t('actions.save')}
             </Button>
diff --git a/src/patients/new/NewPatient.tsx b/src/patients/new/NewPatient.tsx
index c99d1b3262..04a6b8a139 100644
--- a/src/patients/new/NewPatient.tsx
+++ b/src/patients/new/NewPatient.tsx
@@ -98,7 +98,7 @@ const NewPatient = () => {
         error={createError}
       />
       <div className="row float-right">
-        <div className="btn-group btn-group-lg mt-3">
+        <div className="btn-group btn-group-lg mt-3 mr-3">
           <Button className="btn-save mr-2" color="success" onClick={onSave}>
             {t('actions.save')}
           </Button>
diff --git a/src/scheduling/appointments/new/NewAppointment.tsx b/src/scheduling/appointments/new/NewAppointment.tsx
index ce9ce65c10..5faaaa56fa 100644
--- a/src/scheduling/appointments/new/NewAppointment.tsx
+++ b/src/scheduling/appointments/new/NewAppointment.tsx
@@ -110,7 +110,7 @@ const NewAppointment = () => {
           onFieldChange={onFieldChange}
         />
         <div className="row float-right">
-          <div className="btn-group btn-group-lg">
+          <div className="btn-group btn-group-lg mr-3">
             <Button className="mr-2" color="success" onClick={onSave}>
               {t('actions.save')}
             </Button>