From e74e30678c54738c100a240de9341f1c8bcce948 Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Sun, 29 May 2022 17:17:50 +0200
Subject: [PATCH] Apply explicit styling for buttons

See #4834
---
 com.woltlab.wcf/templates/__buttonFormField.tpl           | 2 +-
 com.woltlab.wcf/templates/__formButton.tpl                | 2 +-
 com.woltlab.wcf/templates/__mediaSetCategoryDialog.tpl    | 2 +-
 .../templates/__multifactorTotpDeviceNoDeleteButton.tpl   | 2 +-
 com.woltlab.wcf/templates/__wysiwygPreviewFormButton.tpl  | 2 +-
 com.woltlab.wcf/templates/accountSecurity.tpl             | 2 +-
 com.woltlab.wcf/templates/articleAdd.tpl                  | 2 +-
 com.woltlab.wcf/templates/articleAddDialog.tpl            | 2 +-
 com.woltlab.wcf/templates/commentAddGuestDialog.tpl       | 2 +-
 com.woltlab.wcf/templates/commentEditor.tpl               | 4 ++--
 com.woltlab.wcf/templates/commentListAddComment.tpl       | 4 ++--
 com.woltlab.wcf/templates/commentResponseEditor.tpl       | 4 ++--
 com.woltlab.wcf/templates/manageSubscription.tpl          | 2 +-
 com.woltlab.wcf/templates/mediaEditor.tpl                 | 2 +-
 com.woltlab.wcf/templates/membersList.tpl                 | 2 +-
 com.woltlab.wcf/templates/messageFormPreviewButton.tpl    | 2 +-
 com.woltlab.wcf/templates/messageUserConsent.tpl          | 2 +-
 com.woltlab.wcf/templates/moderationList.tpl              | 2 +-
 com.woltlab.wcf/templates/moderationQueueAssignUser.tpl   | 2 +-
 com.woltlab.wcf/templates/moderationReportDialog.tpl      | 2 +-
 com.woltlab.wcf/templates/poll.tpl                        | 8 ++++----
 com.woltlab.wcf/templates/signatureEdit.tpl               | 2 +-
 com.woltlab.wcf/templates/userProfileAboutEditable.tpl    | 4 ++--
 .../install/files/acp/templates/__buttonFormField.tpl     | 2 +-
 .../templates/__devtoolsProjectInstructionsFormField.tpl  | 4 ++--
 wcfsetup/install/files/acp/templates/__formButton.tpl     | 2 +-
 .../files/acp/templates/__mediaSetCategoryDialog.tpl      | 2 +-
 .../install/files/acp/templates/__optionRewriteTest.tpl   | 2 +-
 .../files/acp/templates/__wysiwygPreviewFormButton.tpl    | 2 +-
 wcfsetup/install/files/acp/templates/articleAdd.tpl       | 2 +-
 wcfsetup/install/files/acp/templates/articleAddDialog.tpl | 2 +-
 .../install/files/acp/templates/articleCategoryDialog.tpl | 2 +-
 wcfsetup/install/files/acp/templates/boxAddDialog.tpl     | 2 +-
 .../files/acp/templates/devtoolsNotificationTest.tpl      | 2 +-
 .../acp/templates/devtoolsNotificationTestDialog.tpl      | 2 +-
 .../install/files/acp/templates/devtoolsProjectList.tpl   | 2 +-
 .../install/files/acp/templates/devtoolsProjectSync.tpl   | 4 ++--
 .../files/acp/templates/languageItemEditDialog.tpl        | 4 ++--
 wcfsetup/install/files/acp/templates/mediaEditor.tpl      | 2 +-
 wcfsetup/install/files/acp/templates/package.tpl          | 2 +-
 wcfsetup/install/files/acp/templates/packageUpdate.tpl    | 2 +-
 .../files/acp/templates/packageUpdateUnauthorized.tpl     | 2 +-
 wcfsetup/install/files/acp/templates/pageAddDialog.tpl    | 2 +-
 wcfsetup/install/files/acp/templates/pageHeaderSearch.tpl | 2 +-
 .../files/acp/templates/pluginStoreAuthorization.tpl      | 2 +-
 wcfsetup/install/files/acp/templates/sitemapList.tpl      | 2 +-
 wcfsetup/install/files/acp/templates/stat.tpl             | 2 +-
 wcfsetup/install/files/acp/templates/styleAdd.tpl         | 2 +-
 wcfsetup/install/files/acp/templates/tagSetAsSynonyms.tpl | 2 +-
 wcfsetup/install/files/acp/templates/trophyAdd.tpl        | 2 +-
 50 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/com.woltlab.wcf/templates/__buttonFormField.tpl b/com.woltlab.wcf/templates/__buttonFormField.tpl
index 9e1bf13304..bbcde24e66 100644
--- a/com.woltlab.wcf/templates/__buttonFormField.tpl
+++ b/com.woltlab.wcf/templates/__buttonFormField.tpl
@@ -3,6 +3,6 @@
 	*}id="{@$field->getPrefixedId()}" {*
 	*}name="{@$field->getPrefixedId()}" {*
 	*}value="{$field->getValue()}"{*
-	*}{if !$field->getFieldClasses()|empty} class="{implode from=$field->getFieldClasses() item='class' glue=' '}{$class}{/implode}"{/if}{*
+	*}{if !$field->getFieldClasses()|empty} class="button {implode from=$field->getFieldClasses() item='class' glue=' '}{$class}{/implode}"{/if}{*
 	*}{foreach from=$field->getFieldAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}{*
 *}>{$field->getButtonLabel()}</button>
diff --git a/com.woltlab.wcf/templates/__formButton.tpl b/com.woltlab.wcf/templates/__formButton.tpl
index f5be9fcdb9..ba0213dbc7 100644
--- a/com.woltlab.wcf/templates/__formButton.tpl
+++ b/com.woltlab.wcf/templates/__formButton.tpl
@@ -8,7 +8,7 @@
 		*}>
 {else}
 	<button id="{@$button->getPrefixedId()}"{*
-		*}{if !$button->getClasses()|empty} class="{implode from=$button->getClasses() item='class' glue=' '}{$class}{/implode}"{/if}{*
+		*}{if !$button->getClasses()|empty} class="button {implode from=$button->getClasses() item='class' glue=' '}{$class}{/implode}"{/if}{*
 		*}{foreach from=$button->getAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}{*
 		*}{if $button->getAccessKey()} accesskey="{$button->getAccessKey()}"{/if}{*
 	*}>{$button->getLabel()}</button>
diff --git a/com.woltlab.wcf/templates/__mediaSetCategoryDialog.tpl b/com.woltlab.wcf/templates/__mediaSetCategoryDialog.tpl
index 9e0c3348e6..4c17bdb7a0 100644
--- a/com.woltlab.wcf/templates/__mediaSetCategoryDialog.tpl
+++ b/com.woltlab.wcf/templates/__mediaSetCategoryDialog.tpl
@@ -24,5 +24,5 @@
 </div>
 
 <div class="formSubmit">
-	<button data-type="submit" class="buttonPrimary">{lang}wcf.global.button.submit{/lang}</button>
+	<button data-type="submit" class="button buttonPrimary">{lang}wcf.global.button.submit{/lang}</button>
 </div>
diff --git a/com.woltlab.wcf/templates/__multifactorTotpDeviceNoDeleteButton.tpl b/com.woltlab.wcf/templates/__multifactorTotpDeviceNoDeleteButton.tpl
index 1d4047c157..7cb0b1bdb7 100644
--- a/com.woltlab.wcf/templates/__multifactorTotpDeviceNoDeleteButton.tpl
+++ b/com.woltlab.wcf/templates/__multifactorTotpDeviceNoDeleteButton.tpl
@@ -1,4 +1,4 @@
-<button type="button" id="{@$button->getPrefixedId()}" class="jsStaticDialog" data-dialog-id="{@$button->getPrefixedId()}DeletionInfo">{$button->getLabel()}</button>
+<button type="button" id="{@$button->getPrefixedId()}" class="button jsStaticDialog" data-dialog-id="{@$button->getPrefixedId()}DeletionInfo">{$button->getLabel()}</button>
 <div style="display: none;" id="{@$button->getPrefixedId()}DeletionInfo" data-title="{lang}wcf.user.security.multifactor.totp.lastDevice.title{/lang}">
 	{lang deviceName=$device[deviceName]}wcf.user.security.multifactor.totp.lastDevice{/lang}
 </div>
diff --git a/com.woltlab.wcf/templates/__wysiwygPreviewFormButton.tpl b/com.woltlab.wcf/templates/__wysiwygPreviewFormButton.tpl
index d61999dfcd..a21f888285 100644
--- a/com.woltlab.wcf/templates/__wysiwygPreviewFormButton.tpl
+++ b/com.woltlab.wcf/templates/__wysiwygPreviewFormButton.tpl
@@ -1,5 +1,5 @@
 <button id="{@$button->getPrefixedId()}"{*
-	*}{if !$button->getClasses()|empty} class="{implode from=$button->getClasses() item='class' glue=' '}{$class}{/implode}"{/if}{*
+	*}{if !$button->getClasses()|empty} class="button {implode from=$button->getClasses() item='class' glue=' '}{$class}{/implode}"{/if}{*
 	*}{foreach from=$button->getAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}{*
 	*}{if $button->getAccessKey()} accesskey="{$button->getAccessKey()}"{/if}{*
 *}>{$button->getLabel()}</button>
diff --git a/com.woltlab.wcf/templates/accountSecurity.tpl b/com.woltlab.wcf/templates/accountSecurity.tpl
index bc160423c5..8dc6e8ba35 100644
--- a/com.woltlab.wcf/templates/accountSecurity.tpl
+++ b/com.woltlab.wcf/templates/accountSecurity.tpl
@@ -89,7 +89,7 @@
 					
 					{if !$session->isCurrentSession()}
 						<div class="accountSecurityButtons">
-							<button class="small sessionDeleteButton" data-session-id="{$session->getSessionID()}">{lang}wcf.user.security.deleteSession{/lang}</button>
+							<button class="button small sessionDeleteButton" data-session-id="{$session->getSessionID()}">{lang}wcf.user.security.deleteSession{/lang}</button>
 						</div>
 					{/if}
 				</div>
diff --git a/com.woltlab.wcf/templates/articleAdd.tpl b/com.woltlab.wcf/templates/articleAdd.tpl
index 654027d861..786e5e58f2 100644
--- a/com.woltlab.wcf/templates/articleAdd.tpl
+++ b/com.woltlab.wcf/templates/articleAdd.tpl
@@ -560,7 +560,7 @@
 	
 	<div class="formSubmit">
 		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
-		<button id="buttonMessagePreview" class="jsOnly">{lang}wcf.global.button.preview{/lang}</button>
+		<button id="buttonMessagePreview" class="button jsOnly">{lang}wcf.global.button.preview{/lang}</button>
 		<input type="hidden" name="isMultilingual" value="{@$isMultilingual}">
 		<input type="hidden" name="timeNowReference" value="{@TIME_NOW}">
 		{csrfToken}
diff --git a/com.woltlab.wcf/templates/articleAddDialog.tpl b/com.woltlab.wcf/templates/articleAddDialog.tpl
index a0a5fcf752..4481827921 100644
--- a/com.woltlab.wcf/templates/articleAddDialog.tpl
+++ b/com.woltlab.wcf/templates/articleAddDialog.tpl
@@ -11,7 +11,7 @@
 		</dl>
 		
 		<div class="formSubmit">
-			<button class="buttonPrimary">{lang}wcf.global.button.next{/lang}</button>
+			<button class="button buttonPrimary">{lang}wcf.global.button.next{/lang}</button>
 		</div>
 	</div>
 </div>
diff --git a/com.woltlab.wcf/templates/commentAddGuestDialog.tpl b/com.woltlab.wcf/templates/commentAddGuestDialog.tpl
index e1a16a1658..633049d886 100644
--- a/com.woltlab.wcf/templates/commentAddGuestDialog.tpl
+++ b/com.woltlab.wcf/templates/commentAddGuestDialog.tpl
@@ -22,5 +22,5 @@
 
 <div class="formSubmit">
 	<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
-	<button data-type="cancel">{lang}wcf.global.button.cancel{/lang}</button>
+	<button clas="button" data-type="cancel">{lang}wcf.global.button.cancel{/lang}</button>
 </div>
diff --git a/com.woltlab.wcf/templates/commentEditor.tpl b/com.woltlab.wcf/templates/commentEditor.tpl
index 60461e8ee5..4e70877adc 100644
--- a/com.woltlab.wcf/templates/commentEditor.tpl
+++ b/com.woltlab.wcf/templates/commentEditor.tpl
@@ -6,11 +6,11 @@
 {include file='messageFormTabsInline'}
 
 <div class="formSubmit">
-	<button class="buttonPrimary" data-type="save" accesskey="s">{lang}wcf.global.button.submit{/lang}</button>
+	<button class="button buttonPrimary" data-type="save" accesskey="s">{lang}wcf.global.button.submit{/lang}</button>
 	
 	{include file='messageFormPreviewButton' previewMessageFieldID=$wysiwygSelector previewButtonID=$wysiwygSelector|concat:'_PreviewButton' previewMessageObjectType='com.woltlab.wcf.comment' previewMessageObjectID=$comment->commentID}
 	
-	<button data-type="cancel">{lang}wcf.global.button.cancel{/lang}</button>
+	<button class="button" data-type="cancel">{lang}wcf.global.button.cancel{/lang}</button>
 </div>
 
 {include file='wysiwyg'}
diff --git a/com.woltlab.wcf/templates/commentListAddComment.tpl b/com.woltlab.wcf/templates/commentListAddComment.tpl
index 0a6614a593..5b14b062c5 100644
--- a/com.woltlab.wcf/templates/commentListAddComment.tpl
+++ b/com.woltlab.wcf/templates/commentListAddComment.tpl
@@ -18,7 +18,7 @@
 			{include file='wysiwyg'}
 			
 			<div class="formSubmit">
-				<button class="buttonPrimary" data-type="save" accesskey="s">{lang}wcf.global.button.submit{/lang}</button>
+				<button class="button buttonPrimary" data-type="save" accesskey="s">{lang}wcf.global.button.submit{/lang}</button>
 				
 				{include file='messageFormPreviewButton' previewMessageFieldID=$wysiwygSelector previewButtonID=$wysiwygSelector|concat:'_PreviewButton' previewMessageObjectType='com.woltlab.wcf.comment' previewMessageObjectID=0}
 			</div>
@@ -49,7 +49,7 @@
 				{include file='wysiwyg' wysiwygSelector=$_commentResponseWysiwygSelector}
 				
 				<div class="formSubmit">
-					<button class="buttonPrimary" data-type="save" accesskey="s">{lang}wcf.global.button.submit{/lang}</button>
+					<button class="button buttonPrimary" data-type="save" accesskey="s">{lang}wcf.global.button.submit{/lang}</button>
 					
 					{include file='messageFormPreviewButton' previewMessageFieldID=$_commentResponseWysiwygSelector previewButtonID=$_commentResponseWysiwygSelector|concat:'_PreviewButton' previewMessageObjectType='com.woltlab.wcf.comment.response' previewMessageObjectID=0}
 				</div>
diff --git a/com.woltlab.wcf/templates/commentResponseEditor.tpl b/com.woltlab.wcf/templates/commentResponseEditor.tpl
index 72cd3e6a45..22008fd168 100644
--- a/com.woltlab.wcf/templates/commentResponseEditor.tpl
+++ b/com.woltlab.wcf/templates/commentResponseEditor.tpl
@@ -6,11 +6,11 @@
 {include file='messageFormTabsInline'}
 
 <div class="formSubmit">
-	<button class="buttonPrimary" data-type="save" accesskey="s">{lang}wcf.global.button.submit{/lang}</button>
+	<button class="button buttonPrimary" data-type="save" accesskey="s">{lang}wcf.global.button.submit{/lang}</button>
 	
 	{include file='messageFormPreviewButton' previewMessageFieldID=$wysiwygSelector previewButtonID=$wysiwygSelector|concat:'_PreviewButton' previewMessageObjectType='com.woltlab.wcf.comment.response' previewMessageObjectID=$response->responseID}
 	
-	<button data-type="cancel">{lang}wcf.global.button.cancel{/lang}</button>
+	<button class="button" data-type="cancel">{lang}wcf.global.button.cancel{/lang}</button>
 </div>
 
 {include file='wysiwyg'}
diff --git a/com.woltlab.wcf/templates/manageSubscription.tpl b/com.woltlab.wcf/templates/manageSubscription.tpl
index d62f7bef1c..bcbd288c9a 100644
--- a/com.woltlab.wcf/templates/manageSubscription.tpl
+++ b/com.woltlab.wcf/templates/manageSubscription.tpl
@@ -16,5 +16,5 @@
 </div>
 
 <div class="formSubmit">
-	<button class="jsButtonSave buttonPrimary">{lang}wcf.global.button.save{/lang}</button>
+	<button class="button jsButtonSave buttonPrimary">{lang}wcf.global.button.save{/lang}</button>
 </div>
\ No newline at end of file
diff --git a/com.woltlab.wcf/templates/mediaEditor.tpl b/com.woltlab.wcf/templates/mediaEditor.tpl
index e25e443cbd..3a89822348 100644
--- a/com.woltlab.wcf/templates/mediaEditor.tpl
+++ b/com.woltlab.wcf/templates/mediaEditor.tpl
@@ -134,5 +134,5 @@
 {include file='aclSimple'}
 
 <div class="formSubmit">
-	<button data-type="submit" class="buttonPrimary">{lang}wcf.global.button.submit{/lang}</button>
+	<button data-type="submit" class="button buttonPrimary">{lang}wcf.global.button.submit{/lang}</button>
 </div>
diff --git a/com.woltlab.wcf/templates/membersList.tpl b/com.woltlab.wcf/templates/membersList.tpl
index 2a925b56c8..d66d558259 100644
--- a/com.woltlab.wcf/templates/membersList.tpl
+++ b/com.woltlab.wcf/templates/membersList.tpl
@@ -72,7 +72,7 @@
 			{/hascontent}
 			
 			<div class="containerListFilterOptions jsOnly">
-				<button class="small jsStaticDialog" data-dialog-id="membersListSortFilter"><span class="icon icon16 fa-filter"></span> {lang}wcf.global.filter{/lang}</button>
+				<button class="button small jsStaticDialog" data-dialog-id="membersListSortFilter"><span class="icon icon16 fa-filter"></span> {lang}wcf.global.filter{/lang}</button>
 			</div>
 		</div>
 		<ol class="containerList userList">
diff --git a/com.woltlab.wcf/templates/messageFormPreviewButton.tpl b/com.woltlab.wcf/templates/messageFormPreviewButton.tpl
index 8ed7748182..640daa4664 100644
--- a/com.woltlab.wcf/templates/messageFormPreviewButton.tpl
+++ b/com.woltlab.wcf/templates/messageFormPreviewButton.tpl
@@ -3,7 +3,7 @@
 {if !$previewMessageObjectType|isset}{assign var=previewMessageObjectType value=''}{/if}
 {if !$previewMessageObjectID|isset}{assign var=previewMessageObjectID value=0}{/if}
 
-<button id="{$previewButtonID}" class="jsOnly">{lang}wcf.global.button.preview{/lang}</button>
+<button id="{$previewButtonID}" class="button jsOnly">{lang}wcf.global.button.preview{/lang}</button>
 
 <script data-relocate="true">
 	$(function() {
diff --git a/com.woltlab.wcf/templates/messageUserConsent.tpl b/com.woltlab.wcf/templates/messageUserConsent.tpl
index 0cd19d9315..dd8c92226f 100644
--- a/com.woltlab.wcf/templates/messageUserConsent.tpl
+++ b/com.woltlab.wcf/templates/messageUserConsent.tpl
@@ -5,7 +5,7 @@
 	</div>
 	<div class="messageUserConsentDescription">{lang}wcf.message.user.consent.description{/lang}</div>
 	<div class="messageUserConsentButtonContainer">
-		<button class="small jsButtonMessageUserConsentEnable">{lang}wcf.message.user.consent.button.enable{/lang}</button>
+		<button class="button small jsButtonMessageUserConsentEnable">{lang}wcf.message.user.consent.button.enable{/lang}</button>
 	</div>
 	<div class="messageUserConsentNotice">{lang}wcf.message.user.consent.notice{/lang}</div>
 </div>
diff --git a/com.woltlab.wcf/templates/moderationList.tpl b/com.woltlab.wcf/templates/moderationList.tpl
index 9be41867c1..7f83b5a6fb 100644
--- a/com.woltlab.wcf/templates/moderationList.tpl
+++ b/com.woltlab.wcf/templates/moderationList.tpl
@@ -81,7 +81,7 @@
 						</li>
 					{/hascontent}
 					<li class="columnApplyFilter jsOnly">
-						<button class="small jsStaticDialog" data-dialog-id="moderationListSortFilter"><span class="icon icon16 fa-filter"></span> {lang}wcf.global.filter{/lang}</button>
+						<button class="button small jsStaticDialog" data-dialog-id="moderationListSortFilter"><span class="icon icon16 fa-filter"></span> {lang}wcf.global.filter{/lang}</button>
 					</li>
 				</ol>
 			</li>
diff --git a/com.woltlab.wcf/templates/moderationQueueAssignUser.tpl b/com.woltlab.wcf/templates/moderationQueueAssignUser.tpl
index 7005546cfc..91a2faa89a 100644
--- a/com.woltlab.wcf/templates/moderationQueueAssignUser.tpl
+++ b/com.woltlab.wcf/templates/moderationQueueAssignUser.tpl
@@ -28,7 +28,7 @@
 	</dl>
 	
 	<div class="formSubmit">
-		<button data-type="submit">{lang}wcf.global.button.submit{/lang}</button>
+		<button class="button" data-type="submit">{lang}wcf.global.button.submit{/lang}</button>
 	</div>
 </div>
 
diff --git a/com.woltlab.wcf/templates/moderationReportDialog.tpl b/com.woltlab.wcf/templates/moderationReportDialog.tpl
index 0c1a640182..208c09cf15 100644
--- a/com.woltlab.wcf/templates/moderationReportDialog.tpl
+++ b/com.woltlab.wcf/templates/moderationReportDialog.tpl
@@ -17,6 +17,6 @@
 	{event name='sections'}
 	
 	<div class="formSubmit">
-		<button class="jsSubmitReport buttonPrimary" accesskey="s">{lang}wcf.global.button.submit{/lang}</button>
+		<button class="button jsSubmitReport buttonPrimary" accesskey="s">{lang}wcf.global.button.submit{/lang}</button>
 	</div>
 {/if}
\ No newline at end of file
diff --git a/com.woltlab.wcf/templates/poll.tpl b/com.woltlab.wcf/templates/poll.tpl
index ffb63f47fb..d36addc73b 100644
--- a/com.woltlab.wcf/templates/poll.tpl
+++ b/com.woltlab.wcf/templates/poll.tpl
@@ -54,12 +54,12 @@
 		<div class="formSubmit jsOnly"{if !$poll->canVote() && $__pollView === 'result' && !$poll->canSeeResult()} style="display: none"{/if}>
 			{content}
 				{if $__wcf->getUser()->userID}
-					<button class="small votePollButton"{if $poll->canVote() && $__pollView === 'vote'} disabled{else} hidden{/if}>{lang}wcf.poll.button.vote{/lang}</button>
-					<button class="small showVoteFormButton"{if $__pollView === 'vote' || !$poll->canVote()} hidden{/if}>{lang}wcf.poll.button.showVote{/lang}</button>
-					<button class="small showResultsButton"{if $__pollView === 'result' || !$poll->canSeeResult()} hidden{/if}>{lang}wcf.poll.button.showResult{/lang}</button>
+					<button class="button small votePollButton"{if $poll->canVote() && $__pollView === 'vote'} disabled{else} hidden{/if}>{lang}wcf.poll.button.vote{/lang}</button>
+					<button class="button small showVoteFormButton"{if $__pollView === 'vote' || !$poll->canVote()} hidden{/if}>{lang}wcf.poll.button.showVote{/lang}</button>
+					<button class="button small showResultsButton"{if $__pollView === 'result' || !$poll->canSeeResult()} hidden{/if}>{lang}wcf.poll.button.showResult{/lang}</button>
 				{/if}
 				{if $poll->canViewParticipants() || ($poll->canVote() && $poll->isPublic)}
-					<button class="small showPollParticipantsButton"{if $__pollView === 'vote' || !$poll->canSeeResult()} hidden{/if}>{lang}wcf.poll.button.showParticipants{/lang}</button>
+					<button class="button small showPollParticipantsButton"{if $__pollView === 'vote' || !$poll->canSeeResult()} hidden{/if}>{lang}wcf.poll.button.showParticipants{/lang}</button>
 				{/if}
 
 				{event name='pollButtons'}
diff --git a/com.woltlab.wcf/templates/signatureEdit.tpl b/com.woltlab.wcf/templates/signatureEdit.tpl
index 5d629c9134..4dc87b4baa 100644
--- a/com.woltlab.wcf/templates/signatureEdit.tpl
+++ b/com.woltlab.wcf/templates/signatureEdit.tpl
@@ -60,7 +60,7 @@
 	{if !$__wcf->user->disableSignature}
 		<div class="formSubmit">
 			<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
-			<button id="previewButton" class="jsOnly" accesskey="p">{lang}wcf.global.button.preview{/lang}</button>
+			<button id="previewButton" class="button jsOnly" accesskey="p">{lang}wcf.global.button.preview{/lang}</button>
 			{csrfToken}
 		</div>
 	{/if}
diff --git a/com.woltlab.wcf/templates/userProfileAboutEditable.tpl b/com.woltlab.wcf/templates/userProfileAboutEditable.tpl
index aa3c5280ea..c2b308de93 100644
--- a/com.woltlab.wcf/templates/userProfileAboutEditable.tpl
+++ b/com.woltlab.wcf/templates/userProfileAboutEditable.tpl
@@ -24,8 +24,8 @@
 {/foreach}
 
 <div class="formSubmit">
-	<button class="buttonPrimary" accesskey="s" data-type="save">{lang}wcf.global.button.save{/lang}</button>
-	<button data-type="restore">{lang}wcf.global.button.cancel{/lang}</button>
+	<button class="button buttonPrimary" accesskey="s" data-type="save">{lang}wcf.global.button.save{/lang}</button>
+	<button class="button" data-type="restore">{lang}wcf.global.button.cancel{/lang}</button>
 </div>
 
 <script data-relocate="true">
diff --git a/wcfsetup/install/files/acp/templates/__buttonFormField.tpl b/wcfsetup/install/files/acp/templates/__buttonFormField.tpl
index 9e1bf13304..bbcde24e66 100644
--- a/wcfsetup/install/files/acp/templates/__buttonFormField.tpl
+++ b/wcfsetup/install/files/acp/templates/__buttonFormField.tpl
@@ -3,6 +3,6 @@
 	*}id="{@$field->getPrefixedId()}" {*
 	*}name="{@$field->getPrefixedId()}" {*
 	*}value="{$field->getValue()}"{*
-	*}{if !$field->getFieldClasses()|empty} class="{implode from=$field->getFieldClasses() item='class' glue=' '}{$class}{/implode}"{/if}{*
+	*}{if !$field->getFieldClasses()|empty} class="button {implode from=$field->getFieldClasses() item='class' glue=' '}{$class}{/implode}"{/if}{*
 	*}{foreach from=$field->getFieldAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}{*
 *}>{$field->getButtonLabel()}</button>
diff --git a/wcfsetup/install/files/acp/templates/__devtoolsProjectInstructionsFormField.tpl b/wcfsetup/install/files/acp/templates/__devtoolsProjectInstructionsFormField.tpl
index fb739e6174..8f3fcd7e21 100644
--- a/wcfsetup/install/files/acp/templates/__devtoolsProjectInstructionsFormField.tpl
+++ b/wcfsetup/install/files/acp/templates/__devtoolsProjectInstructionsFormField.tpl
@@ -113,7 +113,7 @@
 			</div>
 			
 			<div class="formSubmit">
-				<button data-type="submit" class="buttonPrimary">{lang}wcf.global.button.submit{/lang}</button>
+				<button data-type="submit" class="button buttonPrimary">{lang}wcf.global.button.submit{/lang}</button>
 			</div>
 		{/capture}
 		
@@ -161,7 +161,7 @@
 			</div>
 			
 			<div class="formSubmit">
-				<button data-type="submit" class="buttonPrimary">{lang}wcf.global.button.submit{/lang}</button>
+				<button data-type="submit" class="button buttonPrimary">{lang}wcf.global.button.submit{/lang}</button>
 			</div>
 		{/capture}
 		
diff --git a/wcfsetup/install/files/acp/templates/__formButton.tpl b/wcfsetup/install/files/acp/templates/__formButton.tpl
index f5be9fcdb9..ba0213dbc7 100644
--- a/wcfsetup/install/files/acp/templates/__formButton.tpl
+++ b/wcfsetup/install/files/acp/templates/__formButton.tpl
@@ -8,7 +8,7 @@
 		*}>
 {else}
 	<button id="{@$button->getPrefixedId()}"{*
-		*}{if !$button->getClasses()|empty} class="{implode from=$button->getClasses() item='class' glue=' '}{$class}{/implode}"{/if}{*
+		*}{if !$button->getClasses()|empty} class="button {implode from=$button->getClasses() item='class' glue=' '}{$class}{/implode}"{/if}{*
 		*}{foreach from=$button->getAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}{*
 		*}{if $button->getAccessKey()} accesskey="{$button->getAccessKey()}"{/if}{*
 	*}>{$button->getLabel()}</button>
diff --git a/wcfsetup/install/files/acp/templates/__mediaSetCategoryDialog.tpl b/wcfsetup/install/files/acp/templates/__mediaSetCategoryDialog.tpl
index 9e0c3348e6..4c17bdb7a0 100644
--- a/wcfsetup/install/files/acp/templates/__mediaSetCategoryDialog.tpl
+++ b/wcfsetup/install/files/acp/templates/__mediaSetCategoryDialog.tpl
@@ -24,5 +24,5 @@
 </div>
 
 <div class="formSubmit">
-	<button data-type="submit" class="buttonPrimary">{lang}wcf.global.button.submit{/lang}</button>
+	<button data-type="submit" class="button buttonPrimary">{lang}wcf.global.button.submit{/lang}</button>
 </div>
diff --git a/wcfsetup/install/files/acp/templates/__optionRewriteTest.tpl b/wcfsetup/install/files/acp/templates/__optionRewriteTest.tpl
index d0ea6b8599..b30b947cb0 100644
--- a/wcfsetup/install/files/acp/templates/__optionRewriteTest.tpl
+++ b/wcfsetup/install/files/acp/templates/__optionRewriteTest.tpl
@@ -20,7 +20,7 @@
 		</div>
 		
 		<div class="formSubmit">
-			<button id="rewriteTestStart" class="buttonPrimary">{lang}wcf.acp.option.url_omit_index_php.button.runTestAgain{/lang}</button>
+			<button id="rewriteTestStart" class="button buttonPrimary">{lang}wcf.acp.option.url_omit_index_php.button.runTestAgain{/lang}</button>
 		</div>
 	</div>
 	<script data-relocate="true">
diff --git a/wcfsetup/install/files/acp/templates/__wysiwygPreviewFormButton.tpl b/wcfsetup/install/files/acp/templates/__wysiwygPreviewFormButton.tpl
index d61999dfcd..a21f888285 100644
--- a/wcfsetup/install/files/acp/templates/__wysiwygPreviewFormButton.tpl
+++ b/wcfsetup/install/files/acp/templates/__wysiwygPreviewFormButton.tpl
@@ -1,5 +1,5 @@
 <button id="{@$button->getPrefixedId()}"{*
-	*}{if !$button->getClasses()|empty} class="{implode from=$button->getClasses() item='class' glue=' '}{$class}{/implode}"{/if}{*
+	*}{if !$button->getClasses()|empty} class="button {implode from=$button->getClasses() item='class' glue=' '}{$class}{/implode}"{/if}{*
 	*}{foreach from=$button->getAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}{*
 	*}{if $button->getAccessKey()} accesskey="{$button->getAccessKey()}"{/if}{*
 *}>{$button->getLabel()}</button>
diff --git a/wcfsetup/install/files/acp/templates/articleAdd.tpl b/wcfsetup/install/files/acp/templates/articleAdd.tpl
index 7eb214f6ad..86e3dd406c 100644
--- a/wcfsetup/install/files/acp/templates/articleAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/articleAdd.tpl
@@ -553,7 +553,7 @@
 	
 	<div class="formSubmit">
 		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
-		<button id="buttonMessagePreview" class="jsOnly">{lang}wcf.global.button.preview{/lang}</button>
+		<button id="buttonMessagePreview" class="button jsOnly">{lang}wcf.global.button.preview{/lang}</button>
 		<input type="hidden" name="isMultilingual" value="{@$isMultilingual}">
 		<input type="hidden" name="timeNowReference" value="{@TIME_NOW}">
 		{csrfToken}
diff --git a/wcfsetup/install/files/acp/templates/articleAddDialog.tpl b/wcfsetup/install/files/acp/templates/articleAddDialog.tpl
index a0a5fcf752..4481827921 100644
--- a/wcfsetup/install/files/acp/templates/articleAddDialog.tpl
+++ b/wcfsetup/install/files/acp/templates/articleAddDialog.tpl
@@ -11,7 +11,7 @@
 		</dl>
 		
 		<div class="formSubmit">
-			<button class="buttonPrimary">{lang}wcf.global.button.next{/lang}</button>
+			<button class="button buttonPrimary">{lang}wcf.global.button.next{/lang}</button>
 		</div>
 	</div>
 </div>
diff --git a/wcfsetup/install/files/acp/templates/articleCategoryDialog.tpl b/wcfsetup/install/files/acp/templates/articleCategoryDialog.tpl
index a58197f8b9..a0a0552c19 100644
--- a/wcfsetup/install/files/acp/templates/articleCategoryDialog.tpl
+++ b/wcfsetup/install/files/acp/templates/articleCategoryDialog.tpl
@@ -14,5 +14,5 @@
 </div>
 
 <div class="formSubmit">
-	<button data-type="submit">{lang}wcf.global.button.submit{/lang}</button>
+	<button class="button" data-type="submit">{lang}wcf.global.button.submit{/lang}</button>
 </div>
diff --git a/wcfsetup/install/files/acp/templates/boxAddDialog.tpl b/wcfsetup/install/files/acp/templates/boxAddDialog.tpl
index 679f71fd06..86e30968f2 100644
--- a/wcfsetup/install/files/acp/templates/boxAddDialog.tpl
+++ b/wcfsetup/install/files/acp/templates/boxAddDialog.tpl
@@ -27,7 +27,7 @@
 		{/if}
 		
 		<div class="formSubmit">
-			<button class="buttonPrimary">{lang}wcf.global.button.next{/lang}</button>
+			<button class="button buttonPrimary">{lang}wcf.global.button.next{/lang}</button>
 		</div>
 	</div>
 </div>
diff --git a/wcfsetup/install/files/acp/templates/devtoolsNotificationTest.tpl b/wcfsetup/install/files/acp/templates/devtoolsNotificationTest.tpl
index d35fccfcef..0d6bc39db6 100644
--- a/wcfsetup/install/files/acp/templates/devtoolsNotificationTest.tpl
+++ b/wcfsetup/install/files/acp/templates/devtoolsNotificationTest.tpl
@@ -22,7 +22,7 @@
 			{foreach from=$eventList item=event}
 				<dt>{lang}wcf.user.notification.{$event->objectType}.{$event->eventName}{/lang}</dt>
 				<dd>
-					<button class="small jsTestEventButton" data-event-id="{$event->eventID}" data-title="{lang}wcf.user.notification.{$event->objectType}.{$event->eventName}{/lang}">{lang}wcf.acp.devtools.notificationTest.button.test{/lang}</button>
+					<button class="button small jsTestEventButton" data-event-id="{$event->eventID}" data-title="{lang}wcf.user.notification.{$event->objectType}.{$event->eventName}{/lang}">{lang}wcf.acp.devtools.notificationTest.button.test{/lang}</button>
 				</dd>
 			{/foreach}
 		</dl>
diff --git a/wcfsetup/install/files/acp/templates/devtoolsNotificationTestDialog.tpl b/wcfsetup/install/files/acp/templates/devtoolsNotificationTestDialog.tpl
index 8bd53e0b38..2dfabb63f1 100644
--- a/wcfsetup/install/files/acp/templates/devtoolsNotificationTestDialog.tpl
+++ b/wcfsetup/install/files/acp/templates/devtoolsNotificationTestDialog.tpl
@@ -132,7 +132,7 @@
 {/if}
 
 <div class="formSubmit">
-	<button class="small buttonPrimary" id="notificationTestAllSectionButton">{lang}wcf.acp.devtools.notificationTest.button.showAll{/lang}</button>
+	<button class="small button buttonPrimary" id="notificationTestAllSectionButton">{lang}wcf.acp.devtools.notificationTest.button.showAll{/lang}</button>
 	<button class="small button" id="notificationTestTitleSectionButton">{lang}wcf.acp.devtools.notificationTest.titles{/lang}</button>
 	<button class="small button" id="notificationTestMessageSectionButton">{lang}wcf.acp.devtools.notificationTest.messages{/lang}</button>
 	<button class="small button" id="notificationTestLinkSectionButton">{lang}wcf.acp.devtools.notificationTest.links{/lang}</button>
diff --git a/wcfsetup/install/files/acp/templates/devtoolsProjectList.tpl b/wcfsetup/install/files/acp/templates/devtoolsProjectList.tpl
index 27da5aa0e3..e492bbbfed 100644
--- a/wcfsetup/install/files/acp/templates/devtoolsProjectList.tpl
+++ b/wcfsetup/install/files/acp/templates/devtoolsProjectList.tpl
@@ -83,7 +83,7 @@
 	</dl>
 	
 	<div class="formSubmit">
-		<button id="projectQuickSetupSubmit" class="buttonPrimary">{lang}wcf.global.button.submit{/lang}</button>
+		<button id="projectQuickSetupSubmit" class="button buttonPrimary">{lang}wcf.global.button.submit{/lang}</button>
 	</div>
 </div>
 
diff --git a/wcfsetup/install/files/acp/templates/devtoolsProjectSync.tpl b/wcfsetup/install/files/acp/templates/devtoolsProjectSync.tpl
index cba4af41b6..cd8075003b 100644
--- a/wcfsetup/install/files/acp/templates/devtoolsProjectSync.tpl
+++ b/wcfsetup/install/files/acp/templates/devtoolsProjectSync.tpl
@@ -65,7 +65,7 @@
 						</td>
 						{if $_isSupported}
 							{if $_targetCount}
-								<td class="columnIcon"><button class="small jsInvokePip" data-target="{$_targets[0]}">{$_targets[0]}</button></td>
+								<td class="columnIcon"><button class="button small jsInvokePip" data-target="{$_targets[0]}">{$_targets[0]}</button></td>
 								<td class="columnText"><small class="jsInvokePipResult" data-target="{$_targets[0]}">{lang}wcf.acp.devtools.sync.status.idle{/lang}</small></td>
 							{else}
 								<td class="columnText" colspan="2">
@@ -85,7 +85,7 @@
 									class="jsHasPipTargets jsSkipTargetDetection"
 								{/if}
 							>
-								<td class="columnIcon"><button class="small jsInvokePip" data-target="{$_targets[$i]}">{$_targets[$i]}</button></td>
+								<td class="columnIcon"><button class="button small jsInvokePip" data-target="{$_targets[$i]}">{$_targets[$i]}</button></td>
 								<td class="columnText"><small class="jsInvokePipResult" data-target="{$_targets[$i]}">{lang}wcf.acp.devtools.sync.status.idle{/lang}</small></td>
 							</tr>
 						{/section}
diff --git a/wcfsetup/install/files/acp/templates/languageItemEditDialog.tpl b/wcfsetup/install/files/acp/templates/languageItemEditDialog.tpl
index 66b43e2865..cf0429101c 100644
--- a/wcfsetup/install/files/acp/templates/languageItemEditDialog.tpl
+++ b/wcfsetup/install/files/acp/templates/languageItemEditDialog.tpl
@@ -46,9 +46,9 @@
 <input type="hidden" name="languageItemID" id="overlayLanguageItemID" value="{@$item->languageItemID}">
 
 <div class="formSubmit">
-	<button class="jsSubmitLanguageItem buttonPrimary" accesskey="s">{lang}wcf.global.button.submit{/lang}</button>
+	<button class="button buttonPrimary jsSubmitLanguageItem" accesskey="s">{lang}wcf.global.button.submit{/lang}</button>
 	
 	{if $item->isCustomLanguageItem}
-		<button class="jsDeleteLanguageItem">{lang}wcf.global.button.delete{/lang}</button>
+		<button class="button jsDeleteLanguageItem">{lang}wcf.global.button.delete{/lang}</button>
 	{/if}
 </div>
\ No newline at end of file
diff --git a/wcfsetup/install/files/acp/templates/mediaEditor.tpl b/wcfsetup/install/files/acp/templates/mediaEditor.tpl
index e25e443cbd..3a89822348 100644
--- a/wcfsetup/install/files/acp/templates/mediaEditor.tpl
+++ b/wcfsetup/install/files/acp/templates/mediaEditor.tpl
@@ -134,5 +134,5 @@
 {include file='aclSimple'}
 
 <div class="formSubmit">
-	<button data-type="submit" class="buttonPrimary">{lang}wcf.global.button.submit{/lang}</button>
+	<button data-type="submit" class="button buttonPrimary">{lang}wcf.global.button.submit{/lang}</button>
 </div>
diff --git a/wcfsetup/install/files/acp/templates/package.tpl b/wcfsetup/install/files/acp/templates/package.tpl
index ceffec1010..38da9a7ffc 100644
--- a/wcfsetup/install/files/acp/templates/package.tpl
+++ b/wcfsetup/install/files/acp/templates/package.tpl
@@ -20,7 +20,7 @@
 			<ul>
 				{content}
 					{if $package->canUninstall()}
-						<li><button class="jsUninstallButton" data-object-id="{@$package->packageID}" data-confirm-message="{lang __encode=true}wcf.acp.package.uninstallation.confirm{/lang}" data-is-required="{if $package->isRequired()}true{else}false{/if}" data-is-application="{if $package->isApplication}true{else}false{/if}"><span class="icon icon16 fa-times"></span> <span>{lang}wcf.acp.package.button.uninstall{/lang}</span></button></li>
+						<li><button class="button jsUninstallButton" data-object-id="{@$package->packageID}" data-confirm-message="{lang __encode=true}wcf.acp.package.uninstallation.confirm{/lang}" data-is-required="{if $package->isRequired()}true{else}false{/if}" data-is-application="{if $package->isApplication}true{else}false{/if}"><span class="icon icon16 fa-times"></span> <span>{lang}wcf.acp.package.button.uninstall{/lang}</span></button></li>
 					{/if}
 
 					{event name='contentHeaderNavigation'}
diff --git a/wcfsetup/install/files/acp/templates/packageUpdate.tpl b/wcfsetup/install/files/acp/templates/packageUpdate.tpl
index a0e134ecba..212526f373 100644
--- a/wcfsetup/install/files/acp/templates/packageUpdate.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUpdate.tpl
@@ -35,7 +35,7 @@
 </div>
 
 <div class="formSubmit">
-	<button class="buttonPrimary" id="packageUpdateSubmitButton">{lang}wcf.global.button.submit{/lang}</button>
+	<button class="button buttonPrimary" id="packageUpdateSubmitButton">{lang}wcf.global.button.submit{/lang}</button>
 </div>
 
 <script data-relocate="true">
diff --git a/wcfsetup/install/files/acp/templates/packageUpdateUnauthorized.tpl b/wcfsetup/install/files/acp/templates/packageUpdateUnauthorized.tpl
index e74f927311..4081b29467 100644
--- a/wcfsetup/install/files/acp/templates/packageUpdateUnauthorized.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUpdateUnauthorized.tpl
@@ -51,5 +51,5 @@
 </section>
 
 <div class="formSubmit">
-	<button class="buttonPrimary" data-type="submit" data-package-update-server-id="{@$updateServer->packageUpdateServerID}">{lang}wcf.global.button.submit{/lang}</button>
+	<button class="button buttonPrimary" data-type="submit" data-package-update-server-id="{@$updateServer->packageUpdateServerID}">{lang}wcf.global.button.submit{/lang}</button>
 </div>
diff --git a/wcfsetup/install/files/acp/templates/pageAddDialog.tpl b/wcfsetup/install/files/acp/templates/pageAddDialog.tpl
index 07abf24d39..dcf57f328b 100644
--- a/wcfsetup/install/files/acp/templates/pageAddDialog.tpl
+++ b/wcfsetup/install/files/acp/templates/pageAddDialog.tpl
@@ -25,7 +25,7 @@
 		{/if}
 		
 		<div class="formSubmit">
-			<button class="buttonPrimary">{lang}wcf.global.button.next{/lang}</button>
+			<button class="button buttonPrimary">{lang}wcf.global.button.next{/lang}</button>
 		</div>
 	</div>
 </div>
diff --git a/wcfsetup/install/files/acp/templates/pageHeaderSearch.tpl b/wcfsetup/install/files/acp/templates/pageHeaderSearch.tpl
index 2ceea051f5..a1a619ad3e 100644
--- a/wcfsetup/install/files/acp/templates/pageHeaderSearch.tpl
+++ b/wcfsetup/install/files/acp/templates/pageHeaderSearch.tpl
@@ -18,7 +18,7 @@
 		
 		<input type="search" name="q" id="pageHeaderSearchInput" class="pageHeaderSearchInput" placeholder="{lang}wcf.global.search.enterSearchTerm{/lang}" autocomplete="off" required value="" data-toggle="search">
 		
-		<button class="pageHeaderSearchInputButton" type="submit">
+		<button class="button pageHeaderSearchInputButton" type="submit">
 			<span class="icon icon16 pointer fa-search" title="{lang}wcf.global.search{/lang}"></span>
 		</button>
 	</div>
diff --git a/wcfsetup/install/files/acp/templates/pluginStoreAuthorization.tpl b/wcfsetup/install/files/acp/templates/pluginStoreAuthorization.tpl
index 7d26fa4db2..61084b5fa9 100644
--- a/wcfsetup/install/files/acp/templates/pluginStoreAuthorization.tpl
+++ b/wcfsetup/install/files/acp/templates/pluginStoreAuthorization.tpl
@@ -20,5 +20,5 @@
 </section>
 
 <div class="formSubmit">
-	<button>{lang}wcf.global.button.submit{/lang}</button>
+	<button class="button buttonPrimary">{lang}wcf.global.button.submit{/lang}</button>
 </div>
\ No newline at end of file
diff --git a/wcfsetup/install/files/acp/templates/sitemapList.tpl b/wcfsetup/install/files/acp/templates/sitemapList.tpl
index 1168b9ec75..0c236befd3 100644
--- a/wcfsetup/install/files/acp/templates/sitemapList.tpl
+++ b/wcfsetup/install/files/acp/templates/sitemapList.tpl
@@ -7,7 +7,7 @@
 
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><button id="sitemapRebuildButton"><span class="icon icon16 fa-refresh"></span> <span>{lang}wcf.acp.rebuildData.com.woltlab.wcf.sitemap{/lang}</span></button></li>
+			<li><button class="button" id="sitemapRebuildButton"><span class="icon icon16 fa-refresh"></span> <span>{lang}wcf.acp.rebuildData.com.woltlab.wcf.sitemap{/lang}</span></button></li>
 
 			{event name='contentHeaderNavigation'}
 		</ul>
diff --git a/wcfsetup/install/files/acp/templates/stat.tpl b/wcfsetup/install/files/acp/templates/stat.tpl
index ba01ac7b72..4bfd6029ec 100644
--- a/wcfsetup/install/files/acp/templates/stat.tpl
+++ b/wcfsetup/install/files/acp/templates/stat.tpl
@@ -72,7 +72,7 @@
 </section>
 
 <div class="formSubmit">
-	<button class="buttonPrimary" id="statRefreshButton">{lang}wcf.global.button.refresh{/lang}</button>
+	<button class="button buttonPrimary" id="statRefreshButton">{lang}wcf.global.button.refresh{/lang}</button>
 </div>
 
 <div id="chartTooltip" class="balloonTooltip active" style="display: none"></div>
diff --git a/wcfsetup/install/files/acp/templates/styleAdd.tpl b/wcfsetup/install/files/acp/templates/styleAdd.tpl
index e0e1bde53e..fdc111ef51 100644
--- a/wcfsetup/install/files/acp/templates/styleAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/styleAdd.tpl
@@ -1174,7 +1174,7 @@
 	</dl>
 	
 	<div class="formSubmit">
-		<button id="styleDisableProtectionSubmit" class="buttonPrimary" disabled>{lang}wcf.global.button.submit{/lang}</button>
+		<button id="styleDisableProtectionSubmit" class="button buttonPrimary" disabled>{lang}wcf.global.button.submit{/lang}</button>
 	</div>
 </div>
 
diff --git a/wcfsetup/install/files/acp/templates/tagSetAsSynonyms.tpl b/wcfsetup/install/files/acp/templates/tagSetAsSynonyms.tpl
index 47b1c65727..1b1c326956 100644
--- a/wcfsetup/install/files/acp/templates/tagSetAsSynonyms.tpl
+++ b/wcfsetup/install/files/acp/templates/tagSetAsSynonyms.tpl
@@ -9,5 +9,5 @@
 </ul>
 
 <div class="formSubmit">
-	<button data-type="submit">{lang}wcf.global.button.submit{/lang}</button>
+	<button class="button" data-type="submit">{lang}wcf.global.button.submit{/lang}</button>
 </div>
diff --git a/wcfsetup/install/files/acp/templates/trophyAdd.tpl b/wcfsetup/install/files/acp/templates/trophyAdd.tpl
index 485f5230cf..944b08e77b 100644
--- a/wcfsetup/install/files/acp/templates/trophyAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/trophyAdd.tpl
@@ -283,7 +283,7 @@
 	</div>
 
 	<div class="formSubmit">
-		<button class="buttonPrimary">{lang}wcf.global.button.save{/lang}</button>
+		<button class="button buttonPrimary">{lang}wcf.global.button.save{/lang}</button>
 	</div>
 </div>
 
-- 
2.20.1