diff --git a/src/components/ActionDialog/ActionDialog.tsx b/src/components/ActionDialog/ActionDialog.tsx
index 9ae6807a6..24589a852 100644
--- a/src/components/ActionDialog/ActionDialog.tsx
+++ b/src/components/ActionDialog/ActionDialog.tsx
@@ -60,7 +60,7 @@ const ActionDialog = withStyles(styles, { name: "ActionDialog" })(
         <DialogContent>{children}</DialogContent>
         <DialogActions>
           <Button onClick={onClose}>
-            <FormattedMessage {...buttonMessages.cancel} />
+            <FormattedMessage {...buttonMessages.back} />
           </Button>
           <ConfirmButton
             transitionState={confirmButtonState}
diff --git a/src/components/SaveButtonBar/SaveButtonBar.tsx b/src/components/SaveButtonBar/SaveButtonBar.tsx
index c0c665896..64dbd9504 100644
--- a/src/components/SaveButtonBar/SaveButtonBar.tsx
+++ b/src/components/SaveButtonBar/SaveButtonBar.tsx
@@ -121,7 +121,7 @@ export const SaveButtonBar = withStyles(styles, { name: "SaveButtonBar" })(
                   >
                     {maybe(
                       () => labels.cancel,
-                      intl.formatMessage(buttonMessages.cancel)
+                      intl.formatMessage(buttonMessages.back)
                     )}
                   </Button>
                   <ConfirmButton
diff --git a/src/orders/components/OrderCancelDialog/OrderCancelDialog.tsx b/src/orders/components/OrderCancelDialog/OrderCancelDialog.tsx
index 0546b5528..8dd834d5e 100644
--- a/src/orders/components/OrderCancelDialog/OrderCancelDialog.tsx
+++ b/src/orders/components/OrderCancelDialog/OrderCancelDialog.tsx
@@ -69,6 +69,7 @@ const OrderCancelDialog = withStyles(styles, { name: "OrderCancelDialog" })(
                   <FormattedMessage
                     defaultMessage="Cancel Order"
                     description="dialog header"
+                    id="OrderCancelDialogHeader"
                   />
                 </DialogTitle>
                 <DialogContent>
@@ -101,7 +102,11 @@ const OrderCancelDialog = withStyles(styles, { name: "OrderCancelDialog" })(
                     variant="contained"
                     type="submit"
                   >
-                    <FormattedMessage {...buttonMessages.cancel} />
+                    <FormattedMessage
+                      defaultMessage="Cancel Order"
+                      description="button"
+                      id="OrderCancelDialogButton"
+                    />
                   </ConfirmButton>
                 </DialogActions>
               </>