diff --git a/dev/Styles/User/MessageView.less b/dev/Styles/User/MessageView.less
index 8b708698f..082cc6ac9 100644
--- a/dev/Styles/User/MessageView.less
+++ b/dev/Styles/User/MessageView.less
@@ -198,7 +198,7 @@
 		}
 	}
 
-	.openpgp-control {
+	.crypto-control {
 		padding: 0.5em;
 
 		span {
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html
index 0e3348f69..73e821ed5 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html
@@ -293,20 +293,20 @@
 						</div>
 
 						<div data-bind="visible: message().pgpEncrypted()">
-							<div class="openpgp-control encrypted" data-bind="css: {success: message().pgpDecrypted()}">
+							<div class="crypto-control encrypted" data-bind="css: {success: message().pgpDecrypted()}">
 								<span data-icon="🔒" data-i18n="OPENPGP/ENCRYPTED_MESSAGE"></span>
 								<button class="btn" data-bind="visible: pgpSupported, click: pgpDecrypt" data-i18n="CRYPTO/DECRYPT"></button>
 							</div>
 						</div>
 						<div data-bind="visible: message().pgpSigned()">
-							<div class="openpgp-control signed" data-bind="css: {success: message().pgpVerified() && message().pgpVerified().success, error: message().pgpVerified() && !message().pgpVerified().success}">
+							<div class="crypto-control signed" data-bind="css: {success: message().pgpVerified() && message().pgpVerified().success, error: message().pgpVerified() && !message().pgpVerified().success}">
 								<span data-icon="✍" data-i18n="OPENPGP/SIGNED_MESSAGE"></span>
 								<button class="btn" data-bind="visible: pgpSupported, click: pgpVerify" data-i18n="CRYPTO/VERIFY"></button>
 							</div>
 						</div>
 
 						<div data-bind="visible: message().smimeEncrypted()">
-							<div class="smime-control encrypted" data-bind="css: {success: message().smimeDecrypted()}">
+							<div class="crypto-control encrypted" data-bind="css: {success: message().smimeDecrypted()}">
 								<span data-icon="🔒" data-i18n="OPENPGP/ENCRYPTED_MESSAGE"></span>
 <!-- TODO
 								<button class="btn" data-bind="click: smimeDecrypt" data-i18n="CRYPTO/DECRYPT"></button>
@@ -314,7 +314,7 @@
 							</div>
 						</div>
 						<div data-bind="visible: message().smimeSigned()">
-							<div class="smime-control signed" data-bind="css: {success: message().smimeVerified() && message().smimeVerified().success, error: message().smimeVerified() && !message().smimeVerified().success}">
+							<div class="crypto-control signed" data-bind="css: {success: message().smimeVerified() && message().smimeVerified().success, error: message().smimeVerified() && !message().smimeVerified().success}">
 								<span data-icon="✍" data-i18n="SMIME/SIGNED_MESSAGE"></span>
 								<button class="btn" data-bind="click: smimeVerify" data-i18n="CRYPTO/VERIFY"></button>
 							</div>
diff --git a/snappymail/v/0.0.0/themes/NextcloudV25+/styles.css b/snappymail/v/0.0.0/themes/NextcloudV25+/styles.css
index 224a989d8..7cb38a5a7 100644
--- a/snappymail/v/0.0.0/themes/NextcloudV25+/styles.css
+++ b/snappymail/v/0.0.0/themes/NextcloudV25+/styles.css
@@ -1850,8 +1850,8 @@ html.sm-msgView-bottom #rl-app .messageView {
 	height: 30px;
 }
 
-#rl-app .messageView .openpgp-control.encrypted,
-#rl-app .messageView .openpgp-control.signed {
+#rl-app .messageView .crypto-control.encrypted,
+#rl-app .messageView .crypto-control.signed {
 	border-radius: var(--nc-border-radius);
 }