diff --git a/src/OrganizationIntegration/OrganizationIntegrationForm/OrganizationIntegrationForm.js b/src/OrganizationIntegration/OrganizationIntegrationForm/OrganizationIntegrationForm.js
index c009bc29..c2b7561c 100644
--- a/src/OrganizationIntegration/OrganizationIntegrationForm/OrganizationIntegrationForm.js
+++ b/src/OrganizationIntegration/OrganizationIntegrationForm/OrganizationIntegrationForm.js
@@ -55,7 +55,7 @@ const OrganizationIntegrationForm = ({
           disabled={pristine || submitting}
           onClick={handleSubmit}
         >
-          <FormattedMessage id="ui-organizations.button.saveAndClose" />
+          <FormattedMessage id="stripes-components.saveAndClose" />
         </Button>
       );
 
diff --git a/src/OrganizationIntegration/OrganizationIntegrationForm/__snapshots__/OrganizationIntegrationForm.test.js.snap b/src/OrganizationIntegration/OrganizationIntegrationForm/__snapshots__/OrganizationIntegrationForm.test.js.snap
index b113b6d8..a3374648 100644
--- a/src/OrganizationIntegration/OrganizationIntegrationForm/__snapshots__/OrganizationIntegrationForm.test.js.snap
+++ b/src/OrganizationIntegration/OrganizationIntegrationForm/__snapshots__/OrganizationIntegrationForm.test.js.snap
@@ -1486,7 +1486,7 @@ exports[`OrganizationIntegrationForm should render correct form structure 1`] =
               <span
                 class="inner"
               >
-                ui-organizations.button.saveAndClose
+                stripes-components.saveAndClose
               </span>
             </button>
           </span>
diff --git a/src/Organizations/OrganizationForm/OrganizationForm.js b/src/Organizations/OrganizationForm/OrganizationForm.js
index 4327045f..c8f9155a 100644
--- a/src/Organizations/OrganizationForm/OrganizationForm.js
+++ b/src/Organizations/OrganizationForm/OrganizationForm.js
@@ -104,7 +104,7 @@ const OrganizationForm = ({
   const paneFooter = (
     <FormFooter
       id="organization-form-save"
-      label={<FormattedMessage id="ui-organizations.button.saveAndClose" />}
+      label={<FormattedMessage id="stripes-components.saveAndClose" />}
       pristine={pristine}
       submitting={submitting}
       handleSubmit={handleSubmit}
diff --git a/src/Organizations/OrganizationForm/__snapshots__/OrganizationForm.test.js.snap b/src/Organizations/OrganizationForm/__snapshots__/OrganizationForm.test.js.snap
index fe2fa7f0..06718e60 100644
--- a/src/Organizations/OrganizationForm/__snapshots__/OrganizationForm.test.js.snap
+++ b/src/Organizations/OrganizationForm/__snapshots__/OrganizationForm.test.js.snap
@@ -383,7 +383,7 @@ exports[`OrganizationForm should render correct form with metadata 1`] = `
                   <span
                     class="inner"
                   >
-                    ui-organizations.button.saveAndClose
+                    stripes-components.saveAndClose
                   </span>
                 </button>
               </span>
@@ -792,7 +792,7 @@ exports[`OrganizationForm should render correct non-vendor form structure 1`] =
                   <span
                     class="inner"
                   >
-                    ui-organizations.button.saveAndClose
+                    stripes-components.saveAndClose
                   </span>
                 </button>
               </span>
@@ -1375,7 +1375,7 @@ exports[`OrganizationForm should render correct vendor form structure 1`] = `
                   <span
                     class="inner"
                   >
-                    ui-organizations.button.saveAndClose
+                    stripes-components.saveAndClose
                   </span>
                 </button>
               </span>
diff --git a/src/contacts/EditContact/EditContact.js b/src/contacts/EditContact/EditContact.js
index 97956808..acb4a0c0 100644
--- a/src/contacts/EditContact/EditContact.js
+++ b/src/contacts/EditContact/EditContact.js
@@ -85,7 +85,7 @@ const EditContact = ({
           disabled={pristine || submitting}
           onClick={handleSubmit}
         >
-          <FormattedMessage id="ui-organizations.button.saveAndClose" />
+          <FormattedMessage id="stripes-components.saveAndClose" />
         </Button>
       );
 
diff --git a/src/contacts/EditContact/__snapshots__/EditContact.test.js.snap b/src/contacts/EditContact/__snapshots__/EditContact.test.js.snap
index f4a99b7d..e24941c3 100644
--- a/src/contacts/EditContact/__snapshots__/EditContact.test.js.snap
+++ b/src/contacts/EditContact/__snapshots__/EditContact.test.js.snap
@@ -37833,7 +37833,7 @@ exports[`EditContact should render correct form structure 1`] = `
               <span
                 class="inner"
               >
-                ui-organizations.button.saveAndClose
+                stripes-components.saveAndClose
               </span>
             </button>
           </span>
diff --git a/translations/ui-organizations/ar.json b/translations/ui-organizations/ar.json
index 56f966f5..dd3f9497 100644
--- a/translations/ui-organizations/ar.json
+++ b/translations/ui-organizations/ar.json
@@ -283,7 +283,6 @@
     "showTags": "عرض الوسوم",
     "search.keyword": "الكل",
     "button.cancel": "إلغاء",
-    "button.saveAndClose": "حفظ وإغلاق",
     "interface.url": "عنوان URL",
     "interface.type": "النوع",
     "edit.hideCredentials": "إخفاء البيانات",
diff --git a/translations/ui-organizations/ber.json b/translations/ui-organizations/ber.json
index f9e17db6..29356a05 100644
--- a/translations/ui-organizations/ber.json
+++ b/translations/ui-organizations/ber.json
@@ -283,7 +283,6 @@
     "showTags": "Show tags",
     "search.keyword": "All",
     "button.cancel": "Cancel",
-    "button.saveAndClose": "Save & close",
     "interface.url": "URL",
     "interface.type": "Type",
     "edit.hideCredentials": "Hide credentials",
diff --git a/translations/ui-organizations/ca.json b/translations/ui-organizations/ca.json
index d9069afe..d2af9e38 100644
--- a/translations/ui-organizations/ca.json
+++ b/translations/ui-organizations/ca.json
@@ -283,7 +283,6 @@
     "showTags": "Show tags",
     "search.keyword": "All",
     "button.cancel": "Cancel",
-    "button.saveAndClose": "Save & close",
     "interface.url": "URL",
     "interface.type": "Type",
     "edit.hideCredentials": "Hide credentials",
diff --git a/translations/ui-organizations/cs_CZ.json b/translations/ui-organizations/cs_CZ.json
index 27bc60c1..85070461 100644
--- a/translations/ui-organizations/cs_CZ.json
+++ b/translations/ui-organizations/cs_CZ.json
@@ -283,7 +283,6 @@
     "showTags": "Zobrazit štítky",
     "search.keyword": "Všechny",
     "button.cancel": "Zrušit",
-    "button.saveAndClose": "Uložit a zavřít",
     "interface.url": "URL",
     "interface.type": "Typ",
     "edit.hideCredentials": "Skrýt přihlašovací údaje",
diff --git a/translations/ui-organizations/da.json b/translations/ui-organizations/da.json
index 27ec46a9..b7330923 100644
--- a/translations/ui-organizations/da.json
+++ b/translations/ui-organizations/da.json
@@ -283,7 +283,6 @@
     "showTags": "Show tags",
     "search.keyword": "All",
     "button.cancel": "Cancel",
-    "button.saveAndClose": "Gem & luk",
     "interface.url": "URL",
     "interface.type": "Type",
     "edit.hideCredentials": "Skjul legitimationsoplysninger",
diff --git a/translations/ui-organizations/de.json b/translations/ui-organizations/de.json
index d9d2bff0..2fb948b8 100644
--- a/translations/ui-organizations/de.json
+++ b/translations/ui-organizations/de.json
@@ -283,7 +283,6 @@
     "showTags": "Tags anzeigen",
     "search.keyword": "Alles",
     "button.cancel": "Abbrechen",
-    "button.saveAndClose": "Speichern & schließen",
     "interface.url": "URL",
     "interface.type": "Typ",
     "edit.hideCredentials": "Anmeldeinformationen ausblenden",
diff --git a/translations/ui-organizations/en.json b/translations/ui-organizations/en.json
index 7a8bc1cc..2051e82c 100644
--- a/translations/ui-organizations/en.json
+++ b/translations/ui-organizations/en.json
@@ -138,7 +138,6 @@
 
   "button.bankingInformation.add": "Add banking information",
   "button.cancel": "Cancel",
-  "button.saveAndClose": "Save & close",
 
   "contacts.actions.load.error": "Failed to load contacts data",
 
diff --git a/translations/ui-organizations/en_GB.json b/translations/ui-organizations/en_GB.json
index f9e17db6..29356a05 100644
--- a/translations/ui-organizations/en_GB.json
+++ b/translations/ui-organizations/en_GB.json
@@ -283,7 +283,6 @@
     "showTags": "Show tags",
     "search.keyword": "All",
     "button.cancel": "Cancel",
-    "button.saveAndClose": "Save & close",
     "interface.url": "URL",
     "interface.type": "Type",
     "edit.hideCredentials": "Hide credentials",
diff --git a/translations/ui-organizations/en_SE.json b/translations/ui-organizations/en_SE.json
index f9e17db6..29356a05 100644
--- a/translations/ui-organizations/en_SE.json
+++ b/translations/ui-organizations/en_SE.json
@@ -283,7 +283,6 @@
     "showTags": "Show tags",
     "search.keyword": "All",
     "button.cancel": "Cancel",
-    "button.saveAndClose": "Save & close",
     "interface.url": "URL",
     "interface.type": "Type",
     "edit.hideCredentials": "Hide credentials",
diff --git a/translations/ui-organizations/en_US.json b/translations/ui-organizations/en_US.json
index f9e17db6..29356a05 100644
--- a/translations/ui-organizations/en_US.json
+++ b/translations/ui-organizations/en_US.json
@@ -283,7 +283,6 @@
     "showTags": "Show tags",
     "search.keyword": "All",
     "button.cancel": "Cancel",
-    "button.saveAndClose": "Save & close",
     "interface.url": "URL",
     "interface.type": "Type",
     "edit.hideCredentials": "Hide credentials",
diff --git a/translations/ui-organizations/es.json b/translations/ui-organizations/es.json
index e9a5292b..6d8e2ba3 100644
--- a/translations/ui-organizations/es.json
+++ b/translations/ui-organizations/es.json
@@ -283,7 +283,6 @@
     "showTags": "Mostrar Etiquetas",
     "search.keyword": "Todo",
     "button.cancel": "Cancelar",
-    "button.saveAndClose": "Guardar y cerrar",
     "interface.url": "URL",
     "interface.type": "Tipo",
     "edit.hideCredentials": "Ocultar credenciales",
diff --git a/translations/ui-organizations/es_419.json b/translations/ui-organizations/es_419.json
index cc3f7e59..da5766be 100644
--- a/translations/ui-organizations/es_419.json
+++ b/translations/ui-organizations/es_419.json
@@ -283,7 +283,6 @@
     "showTags": "Mostrar Etiquetas",
     "search.keyword": "Todo",
     "button.cancel": "Cancelar",
-    "button.saveAndClose": "Guardar y cerrar",
     "interface.url": "URL",
     "interface.type": "Tipo",
     "edit.hideCredentials": "Ocultar credenciales",
diff --git a/translations/ui-organizations/es_ES.json b/translations/ui-organizations/es_ES.json
index 71c6ab57..14f22571 100644
--- a/translations/ui-organizations/es_ES.json
+++ b/translations/ui-organizations/es_ES.json
@@ -283,7 +283,6 @@
     "showTags": "Mostrar Etiquetas",
     "search.keyword": "Todo",
     "button.cancel": "Cancelar",
-    "button.saveAndClose": "Guardar y cerrar",
     "interface.url": "URL",
     "interface.type": "Tipo",
     "edit.hideCredentials": "Ocultar credenciales",
diff --git a/translations/ui-organizations/fr.json b/translations/ui-organizations/fr.json
index 19c46708..e19065b4 100644
--- a/translations/ui-organizations/fr.json
+++ b/translations/ui-organizations/fr.json
@@ -283,7 +283,6 @@
     "showTags": "Show tags",
     "search.keyword": "All",
     "button.cancel": "Cancel",
-    "button.saveAndClose": "Save & close",
     "interface.url": "URL",
     "interface.type": "Type",
     "edit.hideCredentials": "Hide credentials",
diff --git a/translations/ui-organizations/fr_FR.json b/translations/ui-organizations/fr_FR.json
index 404e5ac0..a8efbb96 100644
--- a/translations/ui-organizations/fr_FR.json
+++ b/translations/ui-organizations/fr_FR.json
@@ -283,7 +283,6 @@
     "showTags": "Afficher les mots-clés",
     "search.keyword": "Tout",
     "button.cancel": "Annuler",
-    "button.saveAndClose": "Sauvegarder et fermer",
     "interface.url": "URL",
     "interface.type": "Type",
     "edit.hideCredentials": "Masquer les informations d'identification",
diff --git a/translations/ui-organizations/he.json b/translations/ui-organizations/he.json
index f9e17db6..29356a05 100644
--- a/translations/ui-organizations/he.json
+++ b/translations/ui-organizations/he.json
@@ -283,7 +283,6 @@
     "showTags": "Show tags",
     "search.keyword": "All",
     "button.cancel": "Cancel",
-    "button.saveAndClose": "Save & close",
     "interface.url": "URL",
     "interface.type": "Type",
     "edit.hideCredentials": "Hide credentials",
diff --git a/translations/ui-organizations/hi_IN.json b/translations/ui-organizations/hi_IN.json
index f9e17db6..29356a05 100644
--- a/translations/ui-organizations/hi_IN.json
+++ b/translations/ui-organizations/hi_IN.json
@@ -283,7 +283,6 @@
     "showTags": "Show tags",
     "search.keyword": "All",
     "button.cancel": "Cancel",
-    "button.saveAndClose": "Save & close",
     "interface.url": "URL",
     "interface.type": "Type",
     "edit.hideCredentials": "Hide credentials",
diff --git a/translations/ui-organizations/hu.json b/translations/ui-organizations/hu.json
index 259d44dc..ba47c0c3 100644
--- a/translations/ui-organizations/hu.json
+++ b/translations/ui-organizations/hu.json
@@ -283,7 +283,6 @@
     "showTags": "Show tags",
     "search.keyword": "All",
     "button.cancel": "Cancel",
-    "button.saveAndClose": "Save & close",
     "interface.url": "URL",
     "interface.type": "Type",
     "edit.hideCredentials": "Hide credentials",
diff --git a/translations/ui-organizations/it_IT.json b/translations/ui-organizations/it_IT.json
index 336a1e7f..0b54f89d 100644
--- a/translations/ui-organizations/it_IT.json
+++ b/translations/ui-organizations/it_IT.json
@@ -283,7 +283,6 @@
     "showTags": "Mostra tag",
     "search.keyword": "Tutto",
     "button.cancel": "Annulla",
-    "button.saveAndClose": "Salva e chiudi",
     "interface.url": "URL",
     "interface.type": "Tipo",
     "edit.hideCredentials": "Nascondi credenziali",
diff --git a/translations/ui-organizations/ja.json b/translations/ui-organizations/ja.json
index 47d21328..85373e5b 100644
--- a/translations/ui-organizations/ja.json
+++ b/translations/ui-organizations/ja.json
@@ -283,7 +283,6 @@
     "showTags": "タグを表示",
     "search.keyword": "全部",
     "button.cancel": "キャンセル",
-    "button.saveAndClose": "保存して閉じる",
     "interface.url": "URL",
     "interface.type": "種類",
     "edit.hideCredentials": "資格情報を非表示にする",
diff --git a/translations/ui-organizations/ko.json b/translations/ui-organizations/ko.json
index 6feb4208..896f4ff0 100644
--- a/translations/ui-organizations/ko.json
+++ b/translations/ui-organizations/ko.json
@@ -283,7 +283,6 @@
     "showTags": "태그 표시",
     "search.keyword": "모두",
     "button.cancel": "취소",
-    "button.saveAndClose": "저장 후 닫기",
     "interface.url": "URL",
     "interface.type": "유형",
     "edit.hideCredentials": "인증정보 숨기기",
diff --git a/translations/ui-organizations/nb.json b/translations/ui-organizations/nb.json
index f9e17db6..29356a05 100644
--- a/translations/ui-organizations/nb.json
+++ b/translations/ui-organizations/nb.json
@@ -283,7 +283,6 @@
     "showTags": "Show tags",
     "search.keyword": "All",
     "button.cancel": "Cancel",
-    "button.saveAndClose": "Save & close",
     "interface.url": "URL",
     "interface.type": "Type",
     "edit.hideCredentials": "Hide credentials",
diff --git a/translations/ui-organizations/nn.json b/translations/ui-organizations/nn.json
index f9e17db6..29356a05 100644
--- a/translations/ui-organizations/nn.json
+++ b/translations/ui-organizations/nn.json
@@ -283,7 +283,6 @@
     "showTags": "Show tags",
     "search.keyword": "All",
     "button.cancel": "Cancel",
-    "button.saveAndClose": "Save & close",
     "interface.url": "URL",
     "interface.type": "Type",
     "edit.hideCredentials": "Hide credentials",
diff --git a/translations/ui-organizations/pl.json b/translations/ui-organizations/pl.json
index f083099b..e13c210c 100644
--- a/translations/ui-organizations/pl.json
+++ b/translations/ui-organizations/pl.json
@@ -283,7 +283,6 @@
     "showTags": "Pokaż etykiety",
     "search.keyword": "Wszystkie",
     "button.cancel": "Anuluj",
-    "button.saveAndClose": "Zapisz i zamknij",
     "interface.url": "URL",
     "interface.type": "Rodzaj",
     "edit.hideCredentials": "Ukryj dane uwierzytelniające",
diff --git a/translations/ui-organizations/pt_BR.json b/translations/ui-organizations/pt_BR.json
index 52118709..b18a25aa 100644
--- a/translations/ui-organizations/pt_BR.json
+++ b/translations/ui-organizations/pt_BR.json
@@ -283,7 +283,6 @@
     "showTags": "Mostrar tags",
     "search.keyword": "Todos",
     "button.cancel": "Cancelar",
-    "button.saveAndClose": "Salvar e fechar",
     "interface.url": "URL",
     "interface.type": "Tipo",
     "edit.hideCredentials": "Ocultar credenciais",
diff --git a/translations/ui-organizations/pt_PT.json b/translations/ui-organizations/pt_PT.json
index 43cdee0c..4b05f726 100644
--- a/translations/ui-organizations/pt_PT.json
+++ b/translations/ui-organizations/pt_PT.json
@@ -283,7 +283,6 @@
     "showTags": "Show tags",
     "search.keyword": "All",
     "button.cancel": "Cancel",
-    "button.saveAndClose": "Save & close",
     "interface.url": "URL",
     "interface.type": "Type",
     "edit.hideCredentials": "Hide credentials",
diff --git a/translations/ui-organizations/ru.json b/translations/ui-organizations/ru.json
index 48b121f4..d63af3f7 100644
--- a/translations/ui-organizations/ru.json
+++ b/translations/ui-organizations/ru.json
@@ -283,7 +283,6 @@
     "showTags": "Показать теги",
     "search.keyword": "Все",
     "button.cancel": "Отмена",
-    "button.saveAndClose": "Сохранить и закрыть",
     "interface.url": "URL",
     "interface.type": "Тип",
     "edit.hideCredentials": "Hide credentials",
diff --git a/translations/ui-organizations/sk.json b/translations/ui-organizations/sk.json
index f9e17db6..29356a05 100644
--- a/translations/ui-organizations/sk.json
+++ b/translations/ui-organizations/sk.json
@@ -283,7 +283,6 @@
     "showTags": "Show tags",
     "search.keyword": "All",
     "button.cancel": "Cancel",
-    "button.saveAndClose": "Save & close",
     "interface.url": "URL",
     "interface.type": "Type",
     "edit.hideCredentials": "Hide credentials",
diff --git a/translations/ui-organizations/sv.json b/translations/ui-organizations/sv.json
index f9e17db6..29356a05 100644
--- a/translations/ui-organizations/sv.json
+++ b/translations/ui-organizations/sv.json
@@ -283,7 +283,6 @@
     "showTags": "Show tags",
     "search.keyword": "All",
     "button.cancel": "Cancel",
-    "button.saveAndClose": "Save & close",
     "interface.url": "URL",
     "interface.type": "Type",
     "edit.hideCredentials": "Hide credentials",
diff --git a/translations/ui-organizations/ur.json b/translations/ui-organizations/ur.json
index 657fb780..a9f929a2 100644
--- a/translations/ui-organizations/ur.json
+++ b/translations/ui-organizations/ur.json
@@ -283,7 +283,6 @@
     "showTags": "Show tags",
     "search.keyword": "All",
     "button.cancel": "Cancel",
-    "button.saveAndClose": "Save & close",
     "interface.url": "URL",
     "interface.type": "Type",
     "edit.hideCredentials": "Hide credentials",
diff --git a/translations/ui-organizations/zh_CN.json b/translations/ui-organizations/zh_CN.json
index 470ea61f..641f27a6 100644
--- a/translations/ui-organizations/zh_CN.json
+++ b/translations/ui-organizations/zh_CN.json
@@ -283,7 +283,6 @@
     "showTags": "显示标签",
     "search.keyword": "所有",
     "button.cancel": "取消",
-    "button.saveAndClose": "保存并关闭",
     "interface.url": "URL",
     "interface.type": "类型",
     "edit.hideCredentials": "隐藏凭证",
diff --git a/translations/ui-organizations/zh_TW.json b/translations/ui-organizations/zh_TW.json
index 8a0714f1..f16b918e 100644
--- a/translations/ui-organizations/zh_TW.json
+++ b/translations/ui-organizations/zh_TW.json
@@ -283,7 +283,6 @@
     "showTags": "顯示標籤",
     "search.keyword": "全部",
     "button.cancel": "取消",
-    "button.saveAndClose": "儲存並關閉",
     "interface.url": "URL",
     "interface.type": "類型",
     "edit.hideCredentials": "隱藏憑證",