diff --git a/apps/app-frontend/src/components/ui/modal/ModrinthAccountRequiredModal.vue b/apps/app-frontend/src/components/ui/modal/ModrinthAccountRequiredModal.vue
index 18b832278d..ad413f1ab8 100644
--- a/apps/app-frontend/src/components/ui/modal/ModrinthAccountRequiredModal.vue
+++ b/apps/app-frontend/src/components/ui/modal/ModrinthAccountRequiredModal.vue
@@ -73,7 +73,7 @@
 				<div class="grid grid-cols-1 gap-2 sm:grid-cols-2">
 					<Button type="outlined" class="w-full" native-type="button" @click="modal?.hide()">
 						<XIcon aria-hidden="true" />
-						{{ formatMessage(messages.cancelButton) }}
+						{{ formatMessage(commonMessages.cancelButton) }}
 					</Button>
 					<Button
 						class="w-full"
@@ -106,7 +106,14 @@
 
 <script setup lang="ts">
 import { LogInIcon, RefreshCwIcon, SpinnerIcon, UserPlusIcon, XIcon } from '@modrinth/assets'
-import { Button, defineMessages, IntlFormatted, NewModal, useVIntl } from '@modrinth/ui'
+import {
+	Button,
+	commonMessages,
+	defineMessages,
+	IntlFormatted,
+	NewModal,
+	useVIntl,
+} from '@modrinth/ui'
 import { openUrl } from '@tauri-apps/plugin-opener'
 import { ref } from 'vue'
 
@@ -245,10 +252,6 @@ const messages = defineMessages({
 		id: 'modal.modrinth-account-required.waiting-for-browser',
 		defaultMessage: 'Waiting for browser confirmation...',
 	},
-	cancelButton: {
-		id: 'modal.modrinth-account-required.cancel-button',
-		defaultMessage: 'Cancel',
-	},
 	openBrowserAgainButton: {
 		id: 'modal.modrinth-account-required.open-browser-again-button',
 		defaultMessage: 'Open browser again',
diff --git a/apps/app-frontend/src/locales/da-DK/index.json b/apps/app-frontend/src/locales/da-DK/index.json
index 249cb7b464..c0aa6b0e50 100644
--- a/apps/app-frontend/src/locales/da-DK/index.json
+++ b/apps/app-frontend/src/locales/da-DK/index.json
@@ -1112,9 +1112,6 @@
   "minecraft-required.sign-in": {
     "message": "Log ind på Microsoft"
   },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "Annuller"
-  },
   "modal.modrinth-account-required.continue-in-browser-heading": {
     "message": "Fortsæt i din browser"
   },
diff --git a/apps/app-frontend/src/locales/de-CH/index.json b/apps/app-frontend/src/locales/de-CH/index.json
index 485ddb3f38..c74ea4c9f9 100644
--- a/apps/app-frontend/src/locales/de-CH/index.json
+++ b/apps/app-frontend/src/locales/de-CH/index.json
@@ -1853,9 +1853,6 @@
   "modal.modrinth-account-required.browser-description": {
     "message": "Ein neuer Tab zum Anmelden wurde geöffnet. Schließe die Anmeldung dort ab und kehren anschließend zur App zurück."
   },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "Abbrechen"
-  },
   "modal.modrinth-account-required.continue-in-browser-heading": {
     "message": "Im Browser fortfahren"
   },
diff --git a/apps/app-frontend/src/locales/de-DE/index.json b/apps/app-frontend/src/locales/de-DE/index.json
index 3be909f0f0..aec68c7665 100644
--- a/apps/app-frontend/src/locales/de-DE/index.json
+++ b/apps/app-frontend/src/locales/de-DE/index.json
@@ -1853,9 +1853,6 @@
   "modal.modrinth-account-required.browser-description": {
     "message": "Ein neuer Tab zum Anmelden wurde geöffnet. Schließe die Anmeldung dort ab und kehren anschließend zur App zurück."
   },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "Abbrechen"
-  },
   "modal.modrinth-account-required.continue-in-browser-heading": {
     "message": "Im Browser fortfahren"
   },
diff --git a/apps/app-frontend/src/locales/en-US/index.json b/apps/app-frontend/src/locales/en-US/index.json
index 884e06f247..9b5a674d18 100644
--- a/apps/app-frontend/src/locales/en-US/index.json
+++ b/apps/app-frontend/src/locales/en-US/index.json
@@ -1880,9 +1880,6 @@
   "modal.modrinth-account-required.browser-description": {
     "message": "A new tab opened to sign in. Complete the sign in there, then return to the app."
   },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "Cancel"
-  },
   "modal.modrinth-account-required.continue-in-browser-heading": {
     "message": "Continue in your browser"
   },
diff --git a/apps/app-frontend/src/locales/es-419/index.json b/apps/app-frontend/src/locales/es-419/index.json
index caf734abfe..967688bdfb 100644
--- a/apps/app-frontend/src/locales/es-419/index.json
+++ b/apps/app-frontend/src/locales/es-419/index.json
@@ -1481,9 +1481,6 @@
   "minecraft-required.sign-in": {
     "message": "Iniciar sesión con Microsoft"
   },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "Cancelar"
-  },
   "modal.modrinth-account-required.header": {
     "message": "Cuenta requerida"
   },
diff --git a/apps/app-frontend/src/locales/fr-FR/index.json b/apps/app-frontend/src/locales/fr-FR/index.json
index 246380a6b4..3fdb65f6f0 100644
--- a/apps/app-frontend/src/locales/fr-FR/index.json
+++ b/apps/app-frontend/src/locales/fr-FR/index.json
@@ -1754,9 +1754,6 @@
   "modal.modrinth-account-required.browser-description": {
     "message": "A nouvel onglet a été ouvert pour vous connecter. Finissez la connexion, puis retournez dans l'application."
   },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "Annuler"
-  },
   "modal.modrinth-account-required.continue-in-browser-heading": {
     "message": "Continuer dans votre navigateur"
   },
diff --git a/apps/app-frontend/src/locales/hu-HU/index.json b/apps/app-frontend/src/locales/hu-HU/index.json
index 04455bc7a8..77f9bffdb4 100644
--- a/apps/app-frontend/src/locales/hu-HU/index.json
+++ b/apps/app-frontend/src/locales/hu-HU/index.json
@@ -1856,9 +1856,6 @@
   "modal.modrinth-account-required.browser-description": {
     "message": "Megnyílt egy új lap a bejelentkezéshez. Végezd el ott a bejelentkezést, majd térj vissza az alkalmazásba."
   },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "Mégse"
-  },
   "modal.modrinth-account-required.continue-in-browser-heading": {
     "message": "Folytatás a böngészőben"
   },
diff --git a/apps/app-frontend/src/locales/it-IT/index.json b/apps/app-frontend/src/locales/it-IT/index.json
index 34de8b2a76..16587ed018 100644
--- a/apps/app-frontend/src/locales/it-IT/index.json
+++ b/apps/app-frontend/src/locales/it-IT/index.json
@@ -1853,9 +1853,6 @@
   "modal.modrinth-account-required.browser-description": {
     "message": "Si è aperta una nuova scheda per effettuare l'accesso. Poi torna all'app."
   },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "Annulla"
-  },
   "modal.modrinth-account-required.continue-in-browser-heading": {
     "message": "Continua nel browser"
   },
diff --git a/apps/app-frontend/src/locales/ja-JP/index.json b/apps/app-frontend/src/locales/ja-JP/index.json
index 38db7d4b16..6bd7ff8194 100644
--- a/apps/app-frontend/src/locales/ja-JP/index.json
+++ b/apps/app-frontend/src/locales/ja-JP/index.json
@@ -1853,9 +1853,6 @@
   "modal.modrinth-account-required.browser-description": {
     "message": "サインイン用のタブが開きました。そちらでサインインを完了してから、アプリに戻ってください。"
   },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "キャンセル"
-  },
   "modal.modrinth-account-required.continue-in-browser-heading": {
     "message": "ブラウザで続行"
   },
diff --git a/apps/app-frontend/src/locales/ko-KR/index.json b/apps/app-frontend/src/locales/ko-KR/index.json
index 207a662b3c..1be3efe362 100644
--- a/apps/app-frontend/src/locales/ko-KR/index.json
+++ b/apps/app-frontend/src/locales/ko-KR/index.json
@@ -1853,9 +1853,6 @@
   "modal.modrinth-account-required.browser-description": {
     "message": "로그인을 위한 새 탭이 열렸습니다. 해당 탭에서 로그인을 완료한 후 앱 돌아오세요."
   },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "취소"
-  },
   "modal.modrinth-account-required.continue-in-browser-heading": {
     "message": "브라우저에서 계속 진행"
   },
diff --git a/apps/app-frontend/src/locales/nl-NL/index.json b/apps/app-frontend/src/locales/nl-NL/index.json
index ea8bd2cdd3..10af52cfdb 100644
--- a/apps/app-frontend/src/locales/nl-NL/index.json
+++ b/apps/app-frontend/src/locales/nl-NL/index.json
@@ -1763,9 +1763,6 @@
   "modal.modrinth-account-required.browser-description": {
     "message": "Er is een nieuw tabblad geopend om je aan te melden. Log daar in en ga vervolgens terug naar de app."
   },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "Annuleren"
-  },
   "modal.modrinth-account-required.continue-in-browser-heading": {
     "message": "Doorgaan in je browser"
   },
diff --git a/apps/app-frontend/src/locales/pl-PL/index.json b/apps/app-frontend/src/locales/pl-PL/index.json
index 1fc56093d7..5fb45c66c8 100644
--- a/apps/app-frontend/src/locales/pl-PL/index.json
+++ b/apps/app-frontend/src/locales/pl-PL/index.json
@@ -1619,9 +1619,6 @@
   "minecraft-required.sign-in": {
     "message": "Zaloguj się do Microsoft"
   },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "Anuluj"
-  },
   "modal.modrinth-account-required.continue-in-browser-heading": {
     "message": "Kontynuuj w przeglądarce"
   },
diff --git a/apps/app-frontend/src/locales/pt-BR/index.json b/apps/app-frontend/src/locales/pt-BR/index.json
index 06aa6d9c18..f46b9bbab6 100644
--- a/apps/app-frontend/src/locales/pt-BR/index.json
+++ b/apps/app-frontend/src/locales/pt-BR/index.json
@@ -1856,9 +1856,6 @@
   "modal.modrinth-account-required.browser-description": {
     "message": "Uma nova aba foi aberta para iniciar sessão. Conclua lá, então volte ao aplicativo."
   },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "Cancelar"
-  },
   "modal.modrinth-account-required.continue-in-browser-heading": {
     "message": "Continuar em seu navegador"
   },
diff --git a/apps/app-frontend/src/locales/ru-RU/index.json b/apps/app-frontend/src/locales/ru-RU/index.json
index 9588318155..76ad5b2c8e 100644
--- a/apps/app-frontend/src/locales/ru-RU/index.json
+++ b/apps/app-frontend/src/locales/ru-RU/index.json
@@ -1844,9 +1844,6 @@
   "modal.modrinth-account-required.browser-description": {
     "message": "Открылась вкладка для входа. Завершение вход и вернитесь в приложение."
   },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "Отмена"
-  },
   "modal.modrinth-account-required.continue-in-browser-heading": {
     "message": "Продолжите в браузере"
   },
diff --git a/apps/app-frontend/src/locales/sv-SE/index.json b/apps/app-frontend/src/locales/sv-SE/index.json
index 9fafae441c..a6eb17552c 100644
--- a/apps/app-frontend/src/locales/sv-SE/index.json
+++ b/apps/app-frontend/src/locales/sv-SE/index.json
@@ -1640,9 +1640,6 @@
   "minecraft-required.sign-in": {
     "message": "Logga in på Microsoft"
   },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "Avbryt"
-  },
   "modal.modrinth-account-required.continue-in-browser-heading": {
     "message": "Fortsätt i din webbläsare"
   },
diff --git a/apps/app-frontend/src/locales/tr-TR/index.json b/apps/app-frontend/src/locales/tr-TR/index.json
index 0df2fb9deb..9fe9fd9359 100644
--- a/apps/app-frontend/src/locales/tr-TR/index.json
+++ b/apps/app-frontend/src/locales/tr-TR/index.json
@@ -1457,9 +1457,6 @@
   "minecraft-required.sign-in": {
     "message": "Microsoft'a giriş yap"
   },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "İptal"
-  },
   "modal.modrinth-account-required.continue-in-browser-heading": {
     "message": "Tarayıcında devam et"
   },
diff --git a/apps/app-frontend/src/locales/uk-UA/index.json b/apps/app-frontend/src/locales/uk-UA/index.json
index b3b9cd20f6..1666af7c26 100644
--- a/apps/app-frontend/src/locales/uk-UA/index.json
+++ b/apps/app-frontend/src/locales/uk-UA/index.json
@@ -1853,9 +1853,6 @@
   "modal.modrinth-account-required.browser-description": {
     "message": "Відкрилася нова вкладка, де ви зможете ввійти. Увійдіть, тоді поверніться до застосунку."
   },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "Скасувати"
-  },
   "modal.modrinth-account-required.continue-in-browser-heading": {
     "message": "Продовжити у браузері"
   },
diff --git a/apps/app-frontend/src/locales/zh-CN/index.json b/apps/app-frontend/src/locales/zh-CN/index.json
index c6f14d0b9b..0d6ebfc67c 100644
--- a/apps/app-frontend/src/locales/zh-CN/index.json
+++ b/apps/app-frontend/src/locales/zh-CN/index.json
@@ -1856,9 +1856,6 @@
   "modal.modrinth-account-required.browser-description": {
     "message": "一个新的标签页已打开，你需要在那里完成登录，然后回到Modrinth app。"
   },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "取消"
-  },
   "modal.modrinth-account-required.continue-in-browser-heading": {
     "message": "请在你的浏览器中继续"
   },
diff --git a/apps/app-frontend/src/locales/zh-TW/index.json b/apps/app-frontend/src/locales/zh-TW/index.json
index cce0b1e88b..c87fdb7f28 100644
--- a/apps/app-frontend/src/locales/zh-TW/index.json
+++ b/apps/app-frontend/src/locales/zh-TW/index.json
@@ -1856,9 +1856,6 @@
   "modal.modrinth-account-required.browser-description": {
     "message": "一個新分頁已開啟供你登入。請在該分頁完成登入，然後返回應用程式。"
   },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "取消"
-  },
   "modal.modrinth-account-required.continue-in-browser-heading": {
     "message": "在瀏覽器中繼續"
   },
diff --git a/apps/frontend/src/components/ui/dashboard/CreatorTaxFormModal.vue b/apps/frontend/src/components/ui/dashboard/CreatorTaxFormModal.vue
index 83ca57653d..3999e22cb1 100644
--- a/apps/frontend/src/components/ui/dashboard/CreatorTaxFormModal.vue
+++ b/apps/frontend/src/components/ui/dashboard/CreatorTaxFormModal.vue
@@ -133,7 +133,7 @@
 				</div>
 				<div class="flex w-full flex-row justify-stretch gap-2">
 					<Button class="w-full text-contrast" @click="handleClose">
-						{{ props.closeButtonText ?? formatMessage(messages.closeButton) }}
+						{{ props.closeButtonText ?? formatMessage(commonMessages.closeButton) }}
 					</Button>
 					<Button
 						type="colored"
@@ -267,10 +267,6 @@ const messages = defineMessages({
 		id: 'dashboard.creator-tax-form-modal.confirmation.download-button',
 		defaultMessage: 'Download {formType}',
 	},
-	closeButton: {
-		id: 'dashboard.creator-tax-form-modal.close-button',
-		defaultMessage: 'Close',
-	},
 	incompleteTitle: {
 		id: 'dashboard.creator-tax-form-modal.incomplete.title',
 		defaultMessage: 'Tax form incomplete',
diff --git a/apps/frontend/src/components/ui/moderation/ModpackScanModal.vue b/apps/frontend/src/components/ui/moderation/ModpackScanModal.vue
index 41c0888f81..c3057c955c 100644
--- a/apps/frontend/src/components/ui/moderation/ModpackScanModal.vue
+++ b/apps/frontend/src/components/ui/moderation/ModpackScanModal.vue
@@ -11,6 +11,7 @@ import { Button, IconButton } from '@modrinth/ui'
 import {
 	Combobox,
 	type ComboboxOption,
+	commonMessages,
 	ConfirmModal,
 	defineMessages,
 	injectModrinthClient,
@@ -61,10 +62,6 @@ const messages = defineMessages({
 		id: 'modpack-scan-modal.scanning',
 		defaultMessage: 'Scanning...',
 	},
-	success: {
-		id: 'modpack-scan-modal.success',
-		defaultMessage: 'Success',
-	},
 	failed: {
 		id: 'modpack-scan-modal.failed',
 		defaultMessage: 'Failed',
@@ -102,10 +99,6 @@ const messages = defineMessages({
 		defaultMessage:
 			'This will permanently delete all attribution groups for this project and all files inside them. This action cannot be undone.',
 	},
-	deleteAllGroupsConfirmationProceed: {
-		id: 'modpack-scan-modal.delete-all-groups.proceed',
-		defaultMessage: 'Clear',
-	},
 	deleteAllGroupsSuccess: {
 		id: 'modpack-scan-modal.delete-all-groups.success',
 		defaultMessage: 'All groups cleared successfully.',
@@ -344,7 +337,7 @@ async function clearAllGroups() {
 	if (!failed) {
 		addNotification({
 			type: 'success',
-			title: formatMessage(messages.success),
+			title: formatMessage(commonMessages.successLabel),
 			text: formatMessage(messages.deleteAllGroupsSuccess),
 		})
 	}
@@ -369,7 +362,7 @@ defineExpose({ show, hide })
 		ref="clearModalRef"
 		:title="formatMessage(messages.deleteAllGroupsConfirmationTitle)"
 		:description="formatMessage(messages.deleteAllGroupsConfirmationDescription)"
-		:proceed-label="formatMessage(messages.deleteAllGroupsConfirmationProceed)"
+		:proceed-label="formatMessage(commonMessages.clearButton)"
 		@proceed="clearAllGroups"
 	/>
 
diff --git a/apps/frontend/src/components/ui/servers/marketing/ServerPlanSelector.vue b/apps/frontend/src/components/ui/servers/marketing/ServerPlanSelector.vue
index c36537d79c..9e0bffc6e7 100644
--- a/apps/frontend/src/components/ui/servers/marketing/ServerPlanSelector.vue
+++ b/apps/frontend/src/components/ui/servers/marketing/ServerPlanSelector.vue
@@ -42,8 +42,7 @@ const plans: Record<
 	Plan,
 	{
 		buttonColor: 'blue' | 'green' | 'purple'
-		accentText: string
-		accentBg: string
+		buttonClasses: string
 		name: MessageDescriptor
 		description: MessageDescriptor
 		mostPopular: boolean
@@ -51,8 +50,7 @@ const plans: Record<
 > = {
 	small: {
 		buttonColor: 'blue',
-		accentText: 'text-blue',
-		accentBg: 'bg-bg-blue',
+		buttonClasses: '!bg-highlight-blue !text-blue',
 		name: commonMessages.planSmallLabel,
 		description: defineMessage({
 			id: 'servers.plan.small.description',
@@ -62,8 +60,7 @@ const plans: Record<
 	},
 	medium: {
 		buttonColor: 'green',
-		accentText: 'text-green',
-		accentBg: 'bg-bg-green',
+		buttonClasses: '',
 		name: commonMessages.planMediumLabel,
 		description: defineMessage({
 			id: 'servers.plan.medium.description',
@@ -73,8 +70,7 @@ const plans: Record<
 	},
 	large: {
 		buttonColor: 'purple',
-		accentText: 'text-purple',
-		accentBg: 'bg-bg-purple',
+		buttonClasses: '!bg-highlight-purple !text-purple',
 		name: commonMessages.planLargeLabel,
 		description: defineMessage({
 			id: 'servers.plan.large.description',
@@ -150,16 +146,20 @@ const billingMonths = computed(() => {
 				v-if="outOfStock"
 				disabled
 				size="xl"
-				:type="plans[plan].mostPopular ? 'colored' : 'base'"
-				:color="plans[plan].mostPopular ? plans[plan].buttonColor : undefined"
+				:type="plans[plan].mostPopular ? 'colored' : 'quiet'"
+				:color="plans[plan].buttonColor"
+				:interaction="plans[plan].mostPopular ? undefined : 'none'"
+				:class="plans[plan].buttonClasses"
 			>
 				{{ formatMessage(messages.outOfStock) }}
 			</Button>
 			<Button
 				v-else
 				size="xl"
-				:type="plans[plan].mostPopular ? 'colored' : 'base'"
-				:color="plans[plan].mostPopular ? plans[plan].buttonColor : undefined"
+				:type="plans[plan].mostPopular ? 'colored' : 'quiet'"
+				:color="plans[plan].buttonColor"
+				:interaction="plans[plan].mostPopular ? undefined : 'none'"
+				:class="plans[plan].buttonClasses"
 				@click="() => emit('select')"
 			>
 				{{ formatMessage(messages.selectPlanButton) }}
diff --git a/apps/frontend/src/locales/de-CH/index.json b/apps/frontend/src/locales/de-CH/index.json
index 07f0fe0b28..f8f3215659 100644
--- a/apps/frontend/src/locales/de-CH/index.json
+++ b/apps/frontend/src/locales/de-CH/index.json
@@ -1481,9 +1481,6 @@
   "dashboard.collections.sort.recently-updated": {
     "message": "Kürzlich aktualisiert"
   },
-  "dashboard.creator-tax-form-modal.close-button": {
-    "message": "Schließen"
-  },
   "dashboard.creator-tax-form-modal.confirmation.download-button": {
     "message": "{formType} herunterladen"
   },
@@ -2984,9 +2981,6 @@
   "modpack-scan-modal.delete-all-groups.error": {
     "message": "Fehler beim Löschen aller Gruppen: {error}"
   },
-  "modpack-scan-modal.delete-all-groups.proceed": {
-    "message": "Löschen"
-  },
   "modpack-scan-modal.delete-all-groups.success": {
     "message": "Alle Gruppen wurden gelöscht."
   },
@@ -3026,9 +3020,6 @@
   "modpack-scan-modal.scanning": {
     "message": "Wird gescannt..."
   },
-  "modpack-scan-modal.success": {
-    "message": "Erfolg"
-  },
   "modpack-scan-modal.title": {
     "message": "Modpack-Scan ({scanned}/{total} Dateien)"
   },
diff --git a/apps/frontend/src/locales/de-DE/index.json b/apps/frontend/src/locales/de-DE/index.json
index 575f938421..f78ec91224 100644
--- a/apps/frontend/src/locales/de-DE/index.json
+++ b/apps/frontend/src/locales/de-DE/index.json
@@ -1481,9 +1481,6 @@
   "dashboard.collections.sort.recently-updated": {
     "message": "Kürzlich aktualisiert"
   },
-  "dashboard.creator-tax-form-modal.close-button": {
-    "message": "Schließen"
-  },
   "dashboard.creator-tax-form-modal.confirmation.download-button": {
     "message": "Lade {formType} herunter"
   },
@@ -2984,9 +2981,6 @@
   "modpack-scan-modal.delete-all-groups.error": {
     "message": "Fehler beim Löschen aller Gruppen: {error}"
   },
-  "modpack-scan-modal.delete-all-groups.proceed": {
-    "message": "Löschen"
-  },
   "modpack-scan-modal.delete-all-groups.success": {
     "message": "Alle Gruppen wurden gelöscht."
   },
@@ -3026,9 +3020,6 @@
   "modpack-scan-modal.scanning": {
     "message": "Wird gescannt..."
   },
-  "modpack-scan-modal.success": {
-    "message": "Erfolg"
-  },
   "modpack-scan-modal.title": {
     "message": "Modpack-Scan ({scanned}/{total} Dateien)"
   },
diff --git a/apps/frontend/src/locales/en-US/index.json b/apps/frontend/src/locales/en-US/index.json
index aac072810e..da8e2ed9ef 100644
--- a/apps/frontend/src/locales/en-US/index.json
+++ b/apps/frontend/src/locales/en-US/index.json
@@ -1481,9 +1481,6 @@
   "dashboard.collections.sort.recently-updated": {
     "message": "Recently Updated"
   },
-  "dashboard.creator-tax-form-modal.close-button": {
-    "message": "Close"
-  },
   "dashboard.creator-tax-form-modal.confirmation.download-button": {
     "message": "Download {formType}"
   },
@@ -2984,9 +2981,6 @@
   "modpack-scan-modal.delete-all-groups.error": {
     "message": "Failed to clear all groups: {error}"
   },
-  "modpack-scan-modal.delete-all-groups.proceed": {
-    "message": "Clear"
-  },
   "modpack-scan-modal.delete-all-groups.success": {
     "message": "All groups cleared successfully."
   },
@@ -3026,9 +3020,6 @@
   "modpack-scan-modal.scanning": {
     "message": "Scanning..."
   },
-  "modpack-scan-modal.success": {
-    "message": "Success"
-  },
   "modpack-scan-modal.title": {
     "message": "Modpack Scan ({scanned}/{total} Files)"
   },
diff --git a/apps/frontend/src/locales/es-419/index.json b/apps/frontend/src/locales/es-419/index.json
index 0a27660346..2aa8d978e3 100644
--- a/apps/frontend/src/locales/es-419/index.json
+++ b/apps/frontend/src/locales/es-419/index.json
@@ -1481,9 +1481,6 @@
   "dashboard.collections.sort.recently-updated": {
     "message": "Actualizado recientemente"
   },
-  "dashboard.creator-tax-form-modal.close-button": {
-    "message": "Cerrar"
-  },
   "dashboard.creator-tax-form-modal.confirmation.download-button": {
     "message": "Descargar {formType}"
   },
@@ -2984,9 +2981,6 @@
   "modpack-scan-modal.delete-all-groups.error": {
     "message": "Error al borrar todos los grupos: {error}"
   },
-  "modpack-scan-modal.delete-all-groups.proceed": {
-    "message": "Borrar"
-  },
   "modpack-scan-modal.delete-all-groups.success": {
     "message": "Todos los grupos fueron borrados exitosamente."
   },
@@ -3026,9 +3020,6 @@
   "modpack-scan-modal.scanning": {
     "message": "Escaneando..."
   },
-  "modpack-scan-modal.success": {
-    "message": "Éxito"
-  },
   "modpack-scan-modal.title": {
     "message": "Análisis del modpack ({scanned}/{total} archivos)"
   },
diff --git a/apps/frontend/src/locales/fr-FR/index.json b/apps/frontend/src/locales/fr-FR/index.json
index b5365bf740..a7729d4f72 100644
--- a/apps/frontend/src/locales/fr-FR/index.json
+++ b/apps/frontend/src/locales/fr-FR/index.json
@@ -1481,9 +1481,6 @@
   "dashboard.collections.sort.recently-updated": {
     "message": "Mis à jour récemment"
   },
-  "dashboard.creator-tax-form-modal.close-button": {
-    "message": "Fermer"
-  },
   "dashboard.creator-tax-form-modal.confirmation.download-button": {
     "message": "Télécharger {formType}"
   },
@@ -2984,9 +2981,6 @@
   "modpack-scan-modal.delete-all-groups.error": {
     "message": "Le nettoyage des groupes a échoué : {error}"
   },
-  "modpack-scan-modal.delete-all-groups.proceed": {
-    "message": "Effacer"
-  },
   "modpack-scan-modal.delete-all-groups.success": {
     "message": "Tous les groupes ont été nettoyés avec succès."
   },
@@ -3026,9 +3020,6 @@
   "modpack-scan-modal.scanning": {
     "message": "Scan en cours..."
   },
-  "modpack-scan-modal.success": {
-    "message": "Succès"
-  },
   "modpack-scan-modal.title": {
     "message": "Scan du modpack ({scanned}/{total} fichiers)"
   },
diff --git a/apps/frontend/src/locales/hu-HU/index.json b/apps/frontend/src/locales/hu-HU/index.json
index a3c459e2b0..f95488ce5e 100644
--- a/apps/frontend/src/locales/hu-HU/index.json
+++ b/apps/frontend/src/locales/hu-HU/index.json
@@ -1415,9 +1415,6 @@
   "dashboard.collections.sort.recently-updated": {
     "message": "Nemrég frissített"
   },
-  "dashboard.creator-tax-form-modal.close-button": {
-    "message": "Bezárás"
-  },
   "dashboard.creator-tax-form-modal.confirmation.download-button": {
     "message": "Letöltés {formType}"
   },
diff --git a/apps/frontend/src/locales/it-IT/index.json b/apps/frontend/src/locales/it-IT/index.json
index 1d60b77e9e..b94fefd5b4 100644
--- a/apps/frontend/src/locales/it-IT/index.json
+++ b/apps/frontend/src/locales/it-IT/index.json
@@ -1475,9 +1475,6 @@
   "dashboard.collections.sort.recently-updated": {
     "message": "Ultima modifica"
   },
-  "dashboard.creator-tax-form-modal.close-button": {
-    "message": "Chiudi"
-  },
   "dashboard.creator-tax-form-modal.confirmation.download-button": {
     "message": "Scarica {formType}"
   },
@@ -2975,9 +2972,6 @@
   "modpack-scan-modal.delete-all-groups.error": {
     "message": "Errore nell'eliminazione dei gruppi: {error}"
   },
-  "modpack-scan-modal.delete-all-groups.proceed": {
-    "message": "Procedi"
-  },
   "modpack-scan-modal.delete-all-groups.success": {
     "message": "Tutti i gruppi eliminati con successo."
   },
@@ -3017,9 +3011,6 @@
   "modpack-scan-modal.scanning": {
     "message": "Scansione..."
   },
-  "modpack-scan-modal.success": {
-    "message": "Successo"
-  },
   "modpack-scan-modal.title": {
     "message": "Scansione del pacchetto ({scanned}/{total} file)"
   },
diff --git a/apps/frontend/src/locales/ja-JP/index.json b/apps/frontend/src/locales/ja-JP/index.json
index 07dc22bc11..12b20205b3 100644
--- a/apps/frontend/src/locales/ja-JP/index.json
+++ b/apps/frontend/src/locales/ja-JP/index.json
@@ -1109,9 +1109,6 @@
   "dashboard.collections.sort.recently-updated": {
     "message": "更新順(新しい順)"
   },
-  "dashboard.creator-tax-form-modal.close-button": {
-    "message": "閉じる"
-  },
   "dashboard.creator-tax-form-modal.confirmation.download-button": {
     "message": "{formType} をダウンロード"
   },
diff --git a/apps/frontend/src/locales/ko-KR/index.json b/apps/frontend/src/locales/ko-KR/index.json
index a88933f469..4b43d5eb08 100644
--- a/apps/frontend/src/locales/ko-KR/index.json
+++ b/apps/frontend/src/locales/ko-KR/index.json
@@ -1481,9 +1481,6 @@
   "dashboard.collections.sort.recently-updated": {
     "message": "최근 업데이트"
   },
-  "dashboard.creator-tax-form-modal.close-button": {
-    "message": "닫기"
-  },
   "dashboard.creator-tax-form-modal.confirmation.download-button": {
     "message": "{formType} 다운로드"
   },
@@ -2984,9 +2981,6 @@
   "modpack-scan-modal.delete-all-groups.error": {
     "message": "모든 그룹 삭제 실패: {error}"
   },
-  "modpack-scan-modal.delete-all-groups.proceed": {
-    "message": "삭제"
-  },
   "modpack-scan-modal.delete-all-groups.success": {
     "message": "모든 그룹 삭제 완료."
   },
@@ -3026,9 +3020,6 @@
   "modpack-scan-modal.scanning": {
     "message": "스캔중..."
   },
-  "modpack-scan-modal.success": {
-    "message": "성공"
-  },
   "modpack-scan-modal.title": {
     "message": "모드팩 스캔 ({scanned}/{total} 파일)"
   },
diff --git a/apps/frontend/src/locales/ms-MY/index.json b/apps/frontend/src/locales/ms-MY/index.json
index 23ad7876f3..c12e695005 100644
--- a/apps/frontend/src/locales/ms-MY/index.json
+++ b/apps/frontend/src/locales/ms-MY/index.json
@@ -1112,9 +1112,6 @@
   "dashboard.collections.sort.recently-updated": {
     "message": "Dikemas Kini Baru-baru Ini"
   },
-  "dashboard.creator-tax-form-modal.close-button": {
-    "message": "Tutup"
-  },
   "dashboard.creator-tax-form-modal.confirmation.download-button": {
     "message": "Muat turun {formType}"
   },
@@ -2423,9 +2420,6 @@
   "moderation.page.technicalReview": {
     "message": "Semakan teknikal"
   },
-  "modpack-scan-modal.delete-all-groups.proceed": {
-    "message": "Kosongkan"
-  },
   "modpack-scan-modal.failed": {
     "message": "Gagal"
   },
diff --git a/apps/frontend/src/locales/nl-NL/index.json b/apps/frontend/src/locales/nl-NL/index.json
index 5f8a17e677..6c64df1f48 100644
--- a/apps/frontend/src/locales/nl-NL/index.json
+++ b/apps/frontend/src/locales/nl-NL/index.json
@@ -1478,9 +1478,6 @@
   "dashboard.collections.sort.recently-updated": {
     "message": "Recentelijk geüpdate"
   },
-  "dashboard.creator-tax-form-modal.close-button": {
-    "message": "Sluiten"
-  },
   "dashboard.creator-tax-form-modal.confirmation.download-button": {
     "message": "Download {formType}"
   },
@@ -2981,9 +2978,6 @@
   "modpack-scan-modal.delete-all-groups.error": {
     "message": "Niet gelukt om alle groepen te wissen: {error}"
   },
-  "modpack-scan-modal.delete-all-groups.proceed": {
-    "message": "Wissen"
-  },
   "modpack-scan-modal.delete-all-groups.success": {
     "message": "Alle groepen zijn succesvol gewist."
   },
@@ -3023,9 +3017,6 @@
   "modpack-scan-modal.scanning": {
     "message": "Scannen..."
   },
-  "modpack-scan-modal.success": {
-    "message": "Gelukt"
-  },
   "modpack-scan-modal.title": {
     "message": "Modpack-scan ({scanned}/{total} bestanden)"
   },
diff --git a/apps/frontend/src/locales/pl-PL/index.json b/apps/frontend/src/locales/pl-PL/index.json
index 7454c93009..85f58da7e8 100644
--- a/apps/frontend/src/locales/pl-PL/index.json
+++ b/apps/frontend/src/locales/pl-PL/index.json
@@ -1478,9 +1478,6 @@
   "dashboard.collections.sort.recently-updated": {
     "message": "Ostatnio zaktualizowane"
   },
-  "dashboard.creator-tax-form-modal.close-button": {
-    "message": "Zamknij"
-  },
   "dashboard.creator-tax-form-modal.confirmation.download-button": {
     "message": "Pobierz {formType}"
   },
@@ -2975,9 +2972,6 @@
   "modpack-scan-modal.delete-all-groups-confirmation.description": {
     "message": "Trwale usunie to wszystkie grupy atrybucji i wszystkie zawarte w nich pliki. Tej akcji nie można cofnąć."
   },
-  "modpack-scan-modal.delete-all-groups.proceed": {
-    "message": "Wyczyść"
-  },
   "modpack-scan-modal.failed": {
     "message": "Błąd"
   },
@@ -3014,9 +3008,6 @@
   "modpack-scan-modal.scanning": {
     "message": "Skanowanie..."
   },
-  "modpack-scan-modal.success": {
-    "message": "Sukces"
-  },
   "modpack-scan-modal.title": {
     "message": "Skanowanie paczki modów ({scanned}/{total} plików)"
   },
diff --git a/apps/frontend/src/locales/pt-BR/index.json b/apps/frontend/src/locales/pt-BR/index.json
index 927b8c87b9..20925759f1 100644
--- a/apps/frontend/src/locales/pt-BR/index.json
+++ b/apps/frontend/src/locales/pt-BR/index.json
@@ -1481,9 +1481,6 @@
   "dashboard.collections.sort.recently-updated": {
     "message": "Atualizado recentemente"
   },
-  "dashboard.creator-tax-form-modal.close-button": {
-    "message": "Fechar"
-  },
   "dashboard.creator-tax-form-modal.confirmation.download-button": {
     "message": "Baixar {formType}"
   },
@@ -2984,9 +2981,6 @@
   "modpack-scan-modal.delete-all-groups.error": {
     "message": "Falhou ao excluir todos os grupos: {error}"
   },
-  "modpack-scan-modal.delete-all-groups.proceed": {
-    "message": "Excluir"
-  },
   "modpack-scan-modal.delete-all-groups.success": {
     "message": "Todos os grupos excluídos com sucesso."
   },
@@ -3026,9 +3020,6 @@
   "modpack-scan-modal.scanning": {
     "message": "Verificando..."
   },
-  "modpack-scan-modal.success": {
-    "message": "Sucesso"
-  },
   "modpack-scan-modal.title": {
     "message": "Verificação do pacote de mods ({scanned}/{total} Arquivos)"
   },
diff --git a/apps/frontend/src/locales/ru-RU/index.json b/apps/frontend/src/locales/ru-RU/index.json
index 6ab49be413..51a767ad5b 100644
--- a/apps/frontend/src/locales/ru-RU/index.json
+++ b/apps/frontend/src/locales/ru-RU/index.json
@@ -1475,9 +1475,6 @@
   "dashboard.collections.sort.recently-updated": {
     "message": "Дата обновления"
   },
-  "dashboard.creator-tax-form-modal.close-button": {
-    "message": "Закрыть"
-  },
   "dashboard.creator-tax-form-modal.confirmation.download-button": {
     "message": "Скачать {formType}"
   },
@@ -2978,9 +2975,6 @@
   "modpack-scan-modal.delete-all-groups.error": {
     "message": "Не удалось удалить все группы: {error}"
   },
-  "modpack-scan-modal.delete-all-groups.proceed": {
-    "message": "Удалить"
-  },
   "modpack-scan-modal.delete-all-groups.success": {
     "message": "Все группы успешно удалены."
   },
@@ -3020,9 +3014,6 @@
   "modpack-scan-modal.scanning": {
     "message": "Сканирование..."
   },
-  "modpack-scan-modal.success": {
-    "message": "Готово"
-  },
   "muralpay.account-type.checking": {
     "message": "Расчётный"
   },
diff --git a/apps/frontend/src/locales/sv-SE/index.json b/apps/frontend/src/locales/sv-SE/index.json
index baad9ce0ea..180fefda8c 100644
--- a/apps/frontend/src/locales/sv-SE/index.json
+++ b/apps/frontend/src/locales/sv-SE/index.json
@@ -1313,9 +1313,6 @@
   "dashboard.collections.sort.recently-updated": {
     "message": "Nyligen uppdaterade"
   },
-  "dashboard.creator-tax-form-modal.close-button": {
-    "message": "Stäng"
-  },
   "dashboard.creator-tax-form-modal.confirmation.download-button": {
     "message": "Ladda ner {formType}"
   },
@@ -2645,9 +2642,6 @@
   "modpack-scan-modal.delete-all-groups.error": {
     "message": "Misslyckades att tömma alla grupper: {error}"
   },
-  "modpack-scan-modal.delete-all-groups.proceed": {
-    "message": "Töm"
-  },
   "modpack-scan-modal.failed": {
     "message": "Misslyckades"
   },
diff --git a/apps/frontend/src/locales/tr-TR/index.json b/apps/frontend/src/locales/tr-TR/index.json
index 9e91553fd0..d8c8d5df7d 100644
--- a/apps/frontend/src/locales/tr-TR/index.json
+++ b/apps/frontend/src/locales/tr-TR/index.json
@@ -1358,9 +1358,6 @@
   "dashboard.collections.sort.recently-updated": {
     "message": "Son Güncellenen"
   },
-  "dashboard.creator-tax-form-modal.close-button": {
-    "message": "Kapat"
-  },
   "dashboard.creator-tax-form-modal.confirmation.download-button": {
     "message": "{formType} İndirin"
   },
@@ -2774,9 +2771,6 @@
   "modpack-scan-modal.scanning": {
     "message": "Taranıyor..."
   },
-  "modpack-scan-modal.success": {
-    "message": "Başarılı"
-  },
   "modpack-scan-modal.title": {
     "message": "Mod paketi taraması ({scanned}/{total} Dosyalar)"
   },
diff --git a/apps/frontend/src/locales/uk-UA/index.json b/apps/frontend/src/locales/uk-UA/index.json
index 5c9e76be15..0bd18c26c5 100644
--- a/apps/frontend/src/locales/uk-UA/index.json
+++ b/apps/frontend/src/locales/uk-UA/index.json
@@ -1478,9 +1478,6 @@
   "dashboard.collections.sort.recently-updated": {
     "message": "Нещодавно оновлені"
   },
-  "dashboard.creator-tax-form-modal.close-button": {
-    "message": "Закрити"
-  },
   "dashboard.creator-tax-form-modal.confirmation.download-button": {
     "message": "Завантажити {formType}"
   },
@@ -2981,9 +2978,6 @@
   "modpack-scan-modal.delete-all-groups.error": {
     "message": "Не вдалося очистити всі групи: {error}"
   },
-  "modpack-scan-modal.delete-all-groups.proceed": {
-    "message": "Очистити"
-  },
   "modpack-scan-modal.delete-all-groups.success": {
     "message": "Усі групи успішно очищено."
   },
@@ -3023,9 +3017,6 @@
   "modpack-scan-modal.scanning": {
     "message": "Скануємо…"
   },
-  "modpack-scan-modal.success": {
-    "message": "Успіх"
-  },
   "modpack-scan-modal.title": {
     "message": "Сканування збірки ({scanned}/{total} файлів)"
   },
diff --git a/apps/frontend/src/locales/zh-CN/index.json b/apps/frontend/src/locales/zh-CN/index.json
index e3ec943469..1cbf4f42c0 100644
--- a/apps/frontend/src/locales/zh-CN/index.json
+++ b/apps/frontend/src/locales/zh-CN/index.json
@@ -1481,9 +1481,6 @@
   "dashboard.collections.sort.recently-updated": {
     "message": "最近更新"
   },
-  "dashboard.creator-tax-form-modal.close-button": {
-    "message": "关闭"
-  },
   "dashboard.creator-tax-form-modal.confirmation.download-button": {
     "message": "下载{formType}"
   },
@@ -2984,9 +2981,6 @@
   "modpack-scan-modal.delete-all-groups.error": {
     "message": "未能清除所有组:{error}"
   },
-  "modpack-scan-modal.delete-all-groups.proceed": {
-    "message": "清除"
-  },
   "modpack-scan-modal.delete-all-groups.success": {
     "message": "所有组均已成功清除。"
   },
@@ -3026,9 +3020,6 @@
   "modpack-scan-modal.scanning": {
     "message": "扫描中……"
   },
-  "modpack-scan-modal.success": {
-    "message": "成功"
-  },
   "modpack-scan-modal.title": {
     "message": "模组包扫描 ({scanned}/{total} 个文件)"
   },
diff --git a/apps/frontend/src/locales/zh-TW/index.json b/apps/frontend/src/locales/zh-TW/index.json
index a61f5b1012..6b70244445 100644
--- a/apps/frontend/src/locales/zh-TW/index.json
+++ b/apps/frontend/src/locales/zh-TW/index.json
@@ -1481,9 +1481,6 @@
   "dashboard.collections.sort.recently-updated": {
     "message": "最近更新"
   },
-  "dashboard.creator-tax-form-modal.close-button": {
-    "message": "關閉"
-  },
   "dashboard.creator-tax-form-modal.confirmation.download-button": {
     "message": "下載 {formType}"
   },
@@ -2984,9 +2981,6 @@
   "modpack-scan-modal.delete-all-groups.error": {
     "message": "無法清除所有群組：{error}"
   },
-  "modpack-scan-modal.delete-all-groups.proceed": {
-    "message": "清除"
-  },
   "modpack-scan-modal.delete-all-groups.success": {
     "message": "已成功清除所有群組。"
   },
@@ -3026,9 +3020,6 @@
   "modpack-scan-modal.scanning": {
     "message": "正在掃描..."
   },
-  "modpack-scan-modal.success": {
-    "message": "成功"
-  },
   "modpack-scan-modal.title": {
     "message": "模組包掃描（{scanned}/{total} 個檔案）"
   },
diff --git a/packages/ui/src/components/sharing/invite-players-modal/index.vue b/packages/ui/src/components/sharing/invite-players-modal/index.vue
index 656459e741..1188a1fcd9 100644
--- a/packages/ui/src/components/sharing/invite-players-modal/index.vue
+++ b/packages/ui/src/components/sharing/invite-players-modal/index.vue
@@ -147,6 +147,7 @@ import { Button } from '#ui/components/base/buttons'
 
 import { defineMessages, useVIntl } from '../../../composables/i18n'
 import { injectNotificationManager } from '../../../providers'
+import { commonMessages } from '../../../utils/common-messages'
 import Avatar from '../../base/Avatar.vue'
 import Combobox from '../../base/Combobox.vue'
 import NewModal from '../../modal/NewModal.vue'
@@ -226,10 +227,6 @@ const messages = defineMessages({
 		id: 'sharing.invite-players-modal.added',
 		defaultMessage: 'Added',
 	},
-	cancelButton: {
-		id: 'sharing.invite-players-modal.cancel',
-		defaultMessage: 'Cancel',
-	},
 	requestedButton: {
 		id: 'sharing.invite-players-modal.requested',
 		defaultMessage: 'Request sent',
@@ -297,7 +294,9 @@ const searchPlaceholderLabel = computed(
 const addButtonLabel = computed(() => props.addLabel ?? formatMessage(messages.addButton))
 const inviteButtonLabel = computed(() => props.inviteLabel ?? formatMessage(messages.inviteButton))
 const addedButtonLabel = computed(() => props.addedLabel ?? formatMessage(messages.addedButton))
-const cancelButtonLabel = computed(() => props.cancelLabel ?? formatMessage(messages.cancelButton))
+const cancelButtonLabel = computed(
+	() => props.cancelLabel ?? formatMessage(commonMessages.cancelButton),
+)
 const requestedButtonLabel = computed(
 	() => props.requestedLabel ?? formatMessage(messages.requestedButton),
 )
diff --git a/packages/ui/src/components/sharing/invite-players-modal/invite-players-modal-invite-link-editor.vue b/packages/ui/src/components/sharing/invite-players-modal/invite-players-modal-invite-link-editor.vue
index e1caca8cd1..c59177c2fd 100644
--- a/packages/ui/src/components/sharing/invite-players-modal/invite-players-modal-invite-link-editor.vue
+++ b/packages/ui/src/components/sharing/invite-players-modal/invite-players-modal-invite-link-editor.vue
@@ -32,7 +32,7 @@
 							/>
 							<div class="flex justify-end gap-2 p-3 pt-1">
 								<Button type="outlined" native-type="button" @click="cancelCustomExpiry">
-									{{ formatMessage(messages.cancel) }}
+									{{ formatMessage(commonMessages.cancelButton) }}
 								</Button>
 								<Button
 									type="colored"
@@ -73,7 +73,7 @@
 			<div class="flex justify-end gap-2">
 				<Button :disabled="saving" @click="modal?.hide()">
 					<XIcon aria-hidden="true" />
-					{{ formatMessage(messages.cancel) }}
+					{{ formatMessage(commonMessages.cancelButton) }}
 				</Button>
 				<Button type="colored" color="brand" :disabled="!canSave" @click="save">
 					<SpinnerIcon v-if="saving" class="animate-spin" aria-hidden="true" />
@@ -94,6 +94,7 @@ import { Button } from '#ui/components/base/buttons'
 import { useFormatDateTime } from '../../../composables'
 import { defineMessages, useVIntl } from '../../../composables/i18n'
 import { injectNotificationManager } from '../../../providers'
+import { commonMessages } from '../../../utils/common-messages'
 import Combobox, { type ComboboxOption } from '../../base/Combobox.vue'
 import DatePicker from '../../base/DatePicker.vue'
 import StyledInput from '../../base/StyledInput.vue'
@@ -186,10 +187,6 @@ const messages = defineMessages({
 		id: 'sharing.invite-players-modal.custom-expiry-value',
 		defaultMessage: 'Custom: {date}',
 	},
-	cancel: {
-		id: 'sharing.invite-players-modal.cancel-button',
-		defaultMessage: 'Cancel',
-	},
 	apply: {
 		id: 'sharing.invite-players-modal.apply-button',
 		defaultMessage: 'Apply',
diff --git a/packages/ui/src/layouts/shared/files-tab/components/editor/EditorFindReplace.vue b/packages/ui/src/layouts/shared/files-tab/components/editor/EditorFindReplace.vue
index 47a19ca752..4248691886 100644
--- a/packages/ui/src/layouts/shared/files-tab/components/editor/EditorFindReplace.vue
+++ b/packages/ui/src/layouts/shared/files-tab/components/editor/EditorFindReplace.vue
@@ -66,9 +66,9 @@
 				</IconButton>
 				<div class="mx-0.5 h-4 w-px bg-surface-5" />
 				<IconButton
-					v-tooltip="formatMessage(messages.closeFind)"
+					v-tooltip="formatMessage(commonMessages.closeButton)"
 					type="quiet"
-					:label="formatMessage(messages.closeFind)"
+					:label="formatMessage(commonMessages.closeButton)"
 					@click="close"
 				>
 					<XIcon />
@@ -118,6 +118,7 @@ import { nextTick, ref, watch } from 'vue'
 import { Button, IconButton } from '#ui/components/base/buttons'
 import StyledInput from '#ui/components/base/StyledInput.vue'
 import { defineMessages, useVIntl } from '#ui/composables/i18n'
+import { commonMessages } from '#ui/utils/common-messages'
 
 const props = defineProps<{
 	isFindOpen: boolean
@@ -161,10 +162,6 @@ const messages = defineMessages({
 		id: 'files.editor.find-next-match',
 		defaultMessage: 'Next match',
 	},
-	closeFind: {
-		id: 'files.editor.find-close',
-		defaultMessage: 'Close',
-	},
 	toggleReplace: {
 		id: 'files.editor.find-toggle-replace',
 		defaultMessage: 'Toggle replace',
diff --git a/packages/ui/src/locales/cs-CZ/index.json b/packages/ui/src/locales/cs-CZ/index.json
index 6552d0fc48..56154cebc0 100644
--- a/packages/ui/src/locales/cs-CZ/index.json
+++ b/packages/ui/src/locales/cs-CZ/index.json
@@ -1130,9 +1130,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "Soubor uložen"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Zavřít"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Najít"
   },
@@ -4557,4 +4554,3 @@
     "defaultMessage": "Typ"
   }
 }
-
diff --git a/packages/ui/src/locales/da-DK/index.json b/packages/ui/src/locales/da-DK/index.json
index 4e5043ceac..71381b8a42 100644
--- a/packages/ui/src/locales/da-DK/index.json
+++ b/packages/ui/src/locales/da-DK/index.json
@@ -557,9 +557,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "Fil gemt"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Luk"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Find"
   },
@@ -2253,4 +2250,3 @@
     "defaultMessage": "Vanilla Shader"
   }
 }
-
diff --git a/packages/ui/src/locales/de-CH/index.json b/packages/ui/src/locales/de-CH/index.json
index 2c28e50ba2..4620db4fa0 100644
--- a/packages/ui/src/locales/de-CH/index.json
+++ b/packages/ui/src/locales/de-CH/index.json
@@ -1304,9 +1304,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "Datei gespeichert"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Schliessen"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Finden"
   },
@@ -5399,12 +5396,6 @@
   "sharing.invite-players-modal.avatar-alt": {
     "defaultMessage": "Avatar von {username}"
   },
-  "sharing.invite-players-modal.cancel": {
-    "defaultMessage": "Abbrechen"
-  },
-  "sharing.invite-players-modal.cancel-button": {
-    "defaultMessage": "Abbrechen"
-  },
   "sharing.invite-players-modal.custom-expiry": {
     "defaultMessage": "Benutzerdefiniert..."
   },
@@ -6240,4 +6231,3 @@
     "defaultMessage": "Typ"
   }
 }
-
diff --git a/packages/ui/src/locales/de-DE/index.json b/packages/ui/src/locales/de-DE/index.json
index d77097b3eb..e49817eab2 100644
--- a/packages/ui/src/locales/de-DE/index.json
+++ b/packages/ui/src/locales/de-DE/index.json
@@ -1304,9 +1304,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "Datei gespeichert"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Schließen"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Finden"
   },
@@ -5399,12 +5396,6 @@
   "sharing.invite-players-modal.avatar-alt": {
     "defaultMessage": "Avatar von {username}"
   },
-  "sharing.invite-players-modal.cancel": {
-    "defaultMessage": "Abbrechen"
-  },
-  "sharing.invite-players-modal.cancel-button": {
-    "defaultMessage": "Abbrechen"
-  },
   "sharing.invite-players-modal.custom-expiry": {
     "defaultMessage": "Benutzerdefiniert..."
   },
@@ -6240,4 +6231,3 @@
     "defaultMessage": "Typ"
   }
 }
-
diff --git a/packages/ui/src/locales/en-US/index.json b/packages/ui/src/locales/en-US/index.json
index f842c47c3d..b1704ca9cc 100644
--- a/packages/ui/src/locales/en-US/index.json
+++ b/packages/ui/src/locales/en-US/index.json
@@ -1304,9 +1304,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "File saved"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Close"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Find"
   },
@@ -5414,12 +5411,6 @@
   "sharing.invite-players-modal.avatar-alt": {
     "defaultMessage": "{username}'s avatar"
   },
-  "sharing.invite-players-modal.cancel": {
-    "defaultMessage": "Cancel"
-  },
-  "sharing.invite-players-modal.cancel-button": {
-    "defaultMessage": "Cancel"
-  },
   "sharing.invite-players-modal.custom-expiry": {
     "defaultMessage": "Custom..."
   },
diff --git a/packages/ui/src/locales/es-419/index.json b/packages/ui/src/locales/es-419/index.json
index 729504e9a4..d72d86a709 100644
--- a/packages/ui/src/locales/es-419/index.json
+++ b/packages/ui/src/locales/es-419/index.json
@@ -1304,9 +1304,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "Archivo guardado"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Cerrar"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Buscar"
   },
@@ -5414,12 +5411,6 @@
   "sharing.invite-players-modal.avatar-alt": {
     "defaultMessage": "Avatar de {username}"
   },
-  "sharing.invite-players-modal.cancel": {
-    "defaultMessage": "Cancelar"
-  },
-  "sharing.invite-players-modal.cancel-button": {
-    "defaultMessage": "Cancelar"
-  },
   "sharing.invite-players-modal.custom-expiry": {
     "defaultMessage": "Otro..."
   },
@@ -6255,4 +6246,3 @@
     "defaultMessage": "Tipo"
   }
 }
-
diff --git a/packages/ui/src/locales/es-ES/index.json b/packages/ui/src/locales/es-ES/index.json
index bfeabbbb50..d198fae97f 100644
--- a/packages/ui/src/locales/es-ES/index.json
+++ b/packages/ui/src/locales/es-ES/index.json
@@ -1187,9 +1187,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "Archivo guardado"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Cerrar"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Encontrar"
   },
diff --git a/packages/ui/src/locales/fil-PH/index.json b/packages/ui/src/locales/fil-PH/index.json
index 330f5de707..643493b467 100644
--- a/packages/ui/src/locales/fil-PH/index.json
+++ b/packages/ui/src/locales/fil-PH/index.json
@@ -341,9 +341,6 @@
   "external-project-license-status.yes": {
     "defaultMessage": "Oo"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Isara"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Hahanapin"
   },
@@ -2766,4 +2763,3 @@
     "defaultMessage": "Uri"
   }
 }
-
diff --git a/packages/ui/src/locales/fr-FR/index.json b/packages/ui/src/locales/fr-FR/index.json
index 094ee87f74..3a73d5ac67 100644
--- a/packages/ui/src/locales/fr-FR/index.json
+++ b/packages/ui/src/locales/fr-FR/index.json
@@ -1301,9 +1301,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "Fichier sauvegardé"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Fermer"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Trouver"
   },
@@ -5390,12 +5387,6 @@
   "sharing.invite-players-modal.avatar-alt": {
     "defaultMessage": "Avatar de {username}"
   },
-  "sharing.invite-players-modal.cancel": {
-    "defaultMessage": "Annuler"
-  },
-  "sharing.invite-players-modal.cancel-button": {
-    "defaultMessage": "Annuler"
-  },
   "sharing.invite-players-modal.custom-expiry": {
     "defaultMessage": "Personnaliser..."
   },
diff --git a/packages/ui/src/locales/hu-HU/index.json b/packages/ui/src/locales/hu-HU/index.json
index 3779af7ee2..56b16f5eb5 100644
--- a/packages/ui/src/locales/hu-HU/index.json
+++ b/packages/ui/src/locales/hu-HU/index.json
@@ -1028,9 +1028,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "A fájl mentve"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Bezárás"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Keresés"
   },
@@ -4544,12 +4541,6 @@
   "sharing.invite-players-modal.avatar-alt": {
     "defaultMessage": "{username} avatárja"
   },
-  "sharing.invite-players-modal.cancel": {
-    "defaultMessage": "Mégse"
-  },
-  "sharing.invite-players-modal.cancel-button": {
-    "defaultMessage": "Mégse"
-  },
   "sharing.invite-players-modal.edit-invite-link": {
     "defaultMessage": "Meghívólink szerkesztése."
   },
diff --git a/packages/ui/src/locales/id-ID/index.json b/packages/ui/src/locales/id-ID/index.json
index ea86cec49e..f813993ef3 100644
--- a/packages/ui/src/locales/id-ID/index.json
+++ b/packages/ui/src/locales/id-ID/index.json
@@ -824,9 +824,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "Berkas disimpan"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Tutup"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Cari"
   },
@@ -2985,4 +2982,3 @@
     "defaultMessage": "Anda memiliki perubahan yang belum tersimpan."
   }
 }
-
diff --git a/packages/ui/src/locales/it-IT/index.json b/packages/ui/src/locales/it-IT/index.json
index 7e05068c8d..8c99b7d979 100644
--- a/packages/ui/src/locales/it-IT/index.json
+++ b/packages/ui/src/locales/it-IT/index.json
@@ -1274,9 +1274,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "File salvato"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Chiudi"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Trova"
   },
@@ -5372,12 +5369,6 @@
   "sharing.invite-players-modal.avatar-alt": {
     "defaultMessage": "Foto profilo di {username}"
   },
-  "sharing.invite-players-modal.cancel": {
-    "defaultMessage": "Annulla"
-  },
-  "sharing.invite-players-modal.cancel-button": {
-    "defaultMessage": "Annulla"
-  },
   "sharing.invite-players-modal.custom-expiry": {
     "defaultMessage": "Personalizzata..."
   },
diff --git a/packages/ui/src/locales/ja-JP/index.json b/packages/ui/src/locales/ja-JP/index.json
index 88b8a1f1e3..8ade34a533 100644
--- a/packages/ui/src/locales/ja-JP/index.json
+++ b/packages/ui/src/locales/ja-JP/index.json
@@ -1220,9 +1220,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "保存済み"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "閉じる"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "検索"
   },
diff --git a/packages/ui/src/locales/ko-KR/index.json b/packages/ui/src/locales/ko-KR/index.json
index ba31764d58..cb845c6eef 100644
--- a/packages/ui/src/locales/ko-KR/index.json
+++ b/packages/ui/src/locales/ko-KR/index.json
@@ -1304,9 +1304,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "파일 저장됨"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "닫다"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "찾다"
   },
@@ -5396,12 +5393,6 @@
   "sharing.invite-players-modal.avatar-alt": {
     "defaultMessage": "{username} 님의 아바타"
   },
-  "sharing.invite-players-modal.cancel": {
-    "defaultMessage": "취소"
-  },
-  "sharing.invite-players-modal.cancel-button": {
-    "defaultMessage": "취소"
-  },
   "sharing.invite-players-modal.custom-expiry": {
     "defaultMessage": "커스텀..."
   },
diff --git a/packages/ui/src/locales/ms-MY/index.json b/packages/ui/src/locales/ms-MY/index.json
index ac9fff9c1f..07a9a3002a 100644
--- a/packages/ui/src/locales/ms-MY/index.json
+++ b/packages/ui/src/locales/ms-MY/index.json
@@ -914,9 +914,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "Fail disimpan"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Tutup"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Cari"
   },
@@ -5058,4 +5055,3 @@
     "defaultMessage": "Jenis"
   }
 }
-
diff --git a/packages/ui/src/locales/nl-NL/index.json b/packages/ui/src/locales/nl-NL/index.json
index f81e8595b8..456e7988e7 100644
--- a/packages/ui/src/locales/nl-NL/index.json
+++ b/packages/ui/src/locales/nl-NL/index.json
@@ -1301,9 +1301,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "Bestand opgeslagen"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Sluiten"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Vind"
   },
@@ -5219,12 +5216,6 @@
   "sharing.invite-players-modal.avatar-alt": {
     "defaultMessage": "Avatar van {username}"
   },
-  "sharing.invite-players-modal.cancel": {
-    "defaultMessage": "Annuleren"
-  },
-  "sharing.invite-players-modal.cancel-button": {
-    "defaultMessage": "Annuleren"
-  },
   "sharing.invite-players-modal.edit-invite-link": {
     "defaultMessage": "Uitnodigingslink bewerken."
   },
diff --git a/packages/ui/src/locales/pl-PL/index.json b/packages/ui/src/locales/pl-PL/index.json
index e94c7806ae..a602e1f73c 100644
--- a/packages/ui/src/locales/pl-PL/index.json
+++ b/packages/ui/src/locales/pl-PL/index.json
@@ -1298,9 +1298,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "Plik zapisany"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Zamknij"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Znajdź"
   },
@@ -5369,12 +5366,6 @@
   "sharing.invite-players-modal.avatar-alt": {
     "defaultMessage": "Awatar użytkownika {username}"
   },
-  "sharing.invite-players-modal.cancel": {
-    "defaultMessage": "Anuluj"
-  },
-  "sharing.invite-players-modal.cancel-button": {
-    "defaultMessage": "Anuluj"
-  },
   "sharing.invite-players-modal.expiry-label": {
     "defaultMessage": "Data wygaśnięcia"
   },
diff --git a/packages/ui/src/locales/pt-BR/index.json b/packages/ui/src/locales/pt-BR/index.json
index 66ce220ef1..454a67c26c 100644
--- a/packages/ui/src/locales/pt-BR/index.json
+++ b/packages/ui/src/locales/pt-BR/index.json
@@ -1304,9 +1304,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "Arquivo salvo"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Fechar"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Localizar"
   },
@@ -5414,12 +5411,6 @@
   "sharing.invite-players-modal.avatar-alt": {
     "defaultMessage": "Avatar de {username}"
   },
-  "sharing.invite-players-modal.cancel": {
-    "defaultMessage": "Cancelar"
-  },
-  "sharing.invite-players-modal.cancel-button": {
-    "defaultMessage": "Cancelar"
-  },
   "sharing.invite-players-modal.custom-expiry": {
     "defaultMessage": "Personalizado..."
   },
@@ -6255,4 +6246,3 @@
     "defaultMessage": "Tipo"
   }
 }
-
diff --git a/packages/ui/src/locales/pt-PT/index.json b/packages/ui/src/locales/pt-PT/index.json
index a0e28dd70f..3fae453a27 100644
--- a/packages/ui/src/locales/pt-PT/index.json
+++ b/packages/ui/src/locales/pt-PT/index.json
@@ -497,9 +497,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "Ficheiro salvo"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Fechar"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Encontrar"
   },
@@ -2526,4 +2523,3 @@
     "defaultMessage": "Tens alterações por guardar."
   }
 }
-
diff --git a/packages/ui/src/locales/ro-RO/index.json b/packages/ui/src/locales/ro-RO/index.json
index 689a414b43..3fe8371574 100644
--- a/packages/ui/src/locales/ro-RO/index.json
+++ b/packages/ui/src/locales/ro-RO/index.json
@@ -551,9 +551,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "Fișier salvat"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Închide"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Caută"
   },
diff --git a/packages/ui/src/locales/ru-RU/index.json b/packages/ui/src/locales/ru-RU/index.json
index 02cfd73fea..24430a0f10 100644
--- a/packages/ui/src/locales/ru-RU/index.json
+++ b/packages/ui/src/locales/ru-RU/index.json
@@ -1232,9 +1232,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "Файл сохранён"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Закрыть"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Найти"
   },
@@ -5327,12 +5324,6 @@
   "sharing.invite-players-modal.avatar-alt": {
     "defaultMessage": "Аватар {username}"
   },
-  "sharing.invite-players-modal.cancel": {
-    "defaultMessage": "Отозвать"
-  },
-  "sharing.invite-players-modal.cancel-button": {
-    "defaultMessage": "Отмена"
-  },
   "sharing.invite-players-modal.custom-expiry": {
     "defaultMessage": "Другое..."
   },
diff --git a/packages/ui/src/locales/sr-CS/index.json b/packages/ui/src/locales/sr-CS/index.json
index ab8bd7321c..a7d528128b 100644
--- a/packages/ui/src/locales/sr-CS/index.json
+++ b/packages/ui/src/locales/sr-CS/index.json
@@ -1253,9 +1253,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "Datoteka sačuvana"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Zatvori"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Pronađi"
   },
@@ -5784,4 +5781,3 @@
     "defaultMessage": "Tip"
   }
 }
-
diff --git a/packages/ui/src/locales/sv-SE/index.json b/packages/ui/src/locales/sv-SE/index.json
index 7bddb0ed35..93cd6523dc 100644
--- a/packages/ui/src/locales/sv-SE/index.json
+++ b/packages/ui/src/locales/sv-SE/index.json
@@ -1142,9 +1142,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "Filen sparades"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Stäng"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Hitta"
   },
@@ -4760,12 +4757,6 @@
   "sharing.invite-players-modal.avatar-alt": {
     "defaultMessage": "{username}s avatar"
   },
-  "sharing.invite-players-modal.cancel": {
-    "defaultMessage": "Avbryt"
-  },
-  "sharing.invite-players-modal.cancel-button": {
-    "defaultMessage": "Avbryt"
-  },
   "sharing.invite-players-modal.custom-expiry": {
     "defaultMessage": "Anpassat..."
   },
@@ -5442,4 +5433,3 @@
     "defaultMessage": "Typ"
   }
 }
-
diff --git a/packages/ui/src/locales/tr-TR/index.json b/packages/ui/src/locales/tr-TR/index.json
index a3b32086b6..8fa466b737 100644
--- a/packages/ui/src/locales/tr-TR/index.json
+++ b/packages/ui/src/locales/tr-TR/index.json
@@ -1274,9 +1274,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "Dosya kaydedildi"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Kapat"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Bul"
   },
diff --git a/packages/ui/src/locales/uk-UA/index.json b/packages/ui/src/locales/uk-UA/index.json
index aec21f8bc4..a4850a6d7d 100644
--- a/packages/ui/src/locales/uk-UA/index.json
+++ b/packages/ui/src/locales/uk-UA/index.json
@@ -1259,9 +1259,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "Файл збережено"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Закрити"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Знайти"
   },
@@ -5363,12 +5360,6 @@
   "sharing.invite-players-modal.avatar-alt": {
     "defaultMessage": "Аватар користувача {username}"
   },
-  "sharing.invite-players-modal.cancel": {
-    "defaultMessage": "Скасувати"
-  },
-  "sharing.invite-players-modal.cancel-button": {
-    "defaultMessage": "Скасувати"
-  },
   "sharing.invite-players-modal.custom-expiry": {
     "defaultMessage": "Власна…"
   },
diff --git a/packages/ui/src/locales/vi-VN/index.json b/packages/ui/src/locales/vi-VN/index.json
index b356f09f22..96044097c8 100644
--- a/packages/ui/src/locales/vi-VN/index.json
+++ b/packages/ui/src/locales/vi-VN/index.json
@@ -935,9 +935,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "Tệp đã được lưu"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Đóng"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Tìm"
   },
@@ -5082,4 +5079,3 @@
     "defaultMessage": "Đội ngũ Modrinth"
   }
 }
-
diff --git a/packages/ui/src/locales/zh-CN/index.json b/packages/ui/src/locales/zh-CN/index.json
index 93120e2208..229117c170 100644
--- a/packages/ui/src/locales/zh-CN/index.json
+++ b/packages/ui/src/locales/zh-CN/index.json
@@ -1304,9 +1304,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "文件已保存"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "关闭"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "查找"
   },
@@ -5414,12 +5411,6 @@
   "sharing.invite-players-modal.avatar-alt": {
     "defaultMessage": "{username} 的头像"
   },
-  "sharing.invite-players-modal.cancel": {
-    "defaultMessage": "取消"
-  },
-  "sharing.invite-players-modal.cancel-button": {
-    "defaultMessage": "取消"
-  },
   "sharing.invite-players-modal.custom-expiry": {
     "defaultMessage": "自定义……"
   },
@@ -6255,4 +6246,3 @@
     "defaultMessage": "类型"
   }
 }
-
diff --git a/packages/ui/src/locales/zh-TW/index.json b/packages/ui/src/locales/zh-TW/index.json
index 99b95591ea..c42ded253b 100644
--- a/packages/ui/src/locales/zh-TW/index.json
+++ b/packages/ui/src/locales/zh-TW/index.json
@@ -1304,9 +1304,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "已儲存檔案"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "關閉"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "尋找"
   },
@@ -5414,12 +5411,6 @@
   "sharing.invite-players-modal.avatar-alt": {
     "defaultMessage": "{username} 的顯示圖片"
   },
-  "sharing.invite-players-modal.cancel": {
-    "defaultMessage": "取消"
-  },
-  "sharing.invite-players-modal.cancel-button": {
-    "defaultMessage": "取消"
-  },
   "sharing.invite-players-modal.custom-expiry": {
     "defaultMessage": "自訂..."
   },
@@ -6255,4 +6246,3 @@
     "defaultMessage": "類型"
   }
 }
-