diff --git a/src/main/resources/fxml/remove_cert.fxml b/src/main/resources/fxml/remove_cert.fxml
index 833a96400..63b44bc70 100644
--- a/src/main/resources/fxml/remove_cert.fxml
+++ b/src/main/resources/fxml/remove_cert.fxml
@@ -43,7 +43,7 @@
 			<ButtonBar buttonMinWidth="120" buttonOrder="+CI">
 				<buttons>
 					<Button text="%generic.button.cancel" ButtonBar.buttonData="CANCEL_CLOSE" defaultButton="true" cancelButton="true" onAction="#close"/>
-					<Button text="%removeCert.confirmBtn" ButtonBar.buttonData="FINISH" onAction="#remove"/>
+					<Button text="%generic.button.remove" ButtonBar.buttonData="FINISH" onAction="#remove"/>
 				</buttons>
 			</ButtonBar>
 		</VBox>
diff --git a/src/main/resources/fxml/remove_vault.fxml b/src/main/resources/fxml/remove_vault.fxml
index 57a36576e..8a48d31f3 100644
--- a/src/main/resources/fxml/remove_vault.fxml
+++ b/src/main/resources/fxml/remove_vault.fxml
@@ -44,7 +44,7 @@
 			<ButtonBar buttonMinWidth="120" buttonOrder="+CI">
 				<buttons>
 					<Button text="%generic.button.cancel" ButtonBar.buttonData="CANCEL_CLOSE" defaultButton="true" cancelButton="true" onAction="#close"/>
-					<Button text="%removeVault.confirmBtn" ButtonBar.buttonData="FINISH" onAction="#finish"/>
+					<Button text="%generic.button.remove" ButtonBar.buttonData="FINISH" onAction="#finish"/>
 				</buttons>
 			</ButtonBar>
 		</VBox>
diff --git a/src/main/resources/i18n/strings.properties b/src/main/resources/i18n/strings.properties
index 7d13efcd8..1df6bc244 100644
--- a/src/main/resources/i18n/strings.properties
+++ b/src/main/resources/i18n/strings.properties
@@ -14,6 +14,7 @@ generic.button.copied=Copied!
 generic.button.done=Done
 generic.button.next=Next
 generic.button.print=Print
+generic.button.remove=Remove
 
 # Error
 error.message=An error occurred
@@ -106,7 +107,6 @@ addvaultwizard.success.unlockNow=Unlock Now
 removeVault.title=Remove "%s"
 removeVault.message=Remove vault?
 removeVault.description=This will only make Cryptomator forget about this vault. You can add it again. No encrypted files will be deleted from your hard drive.
-removeVault.confirmBtn=Remove Vault
 
 # Change Password
 changepassword.title=Change Password
@@ -344,7 +344,6 @@ preferences.contribute.sponsor=Sponsor
 removeCert.title=Remove Certificate
 removeCert.message=Remove supporter certificate?
 removeCert.description=Cryptomator's core features are not affected by this. Neither access to your vaults is restricted nor the level of security is lowered.
-removeCert.confirmBtn=Remove
 #<-- Add entries for donations and code/translation/documentation contribution -->
 
 ## About