From 506fc276708692412febf79196e8ff93197f970d Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Fri, 19 Aug 2022 17:50:54 +0200
Subject: [PATCH] Replace legacy icons

---
 com.woltlab.wcf/templates/user.tpl            |  6 +++++-
 com.woltlab.wcf/templates/userException.tpl   |  2 +-
 .../templates/userInformationHeadline.tpl     |  8 ++++++-
 com.woltlab.wcf/templates/userNotice.tpl      |  4 +++-
 .../templates/__bbcodeAttributesFormField.tpl | 21 ++++++++++++++++---
 ..._devtoolsMissingLanguageItemStackTrace.tpl |  4 +++-
 ...__devtoolsProjectInstructionsFormField.tpl |  8 +++++--
 .../templates/__objectActionDeleteIcon.tpl    |  6 ++++--
 .../templates/__objectActionToogleIcon.tpl    | 10 +++++++--
 .../acp/templates/__optionRewriteTest.tpl     |  4 ++--
 .../install/files/acp/templates/adList.tpl    |  4 +++-
 .../files/acp/templates/articleList.tpl       |  4 +++-
 .../install/files/acp/templates/bbcodeAdd.tpl | 21 ++++++++++++++++---
 .../files/acp/templates/bbcodeList.tpl        |  4 +++-
 .../install/files/acp/templates/boxList.tpl   |  4 +++-
 .../files/acp/templates/contactSettings.tpl   |  8 +++++--
 .../files/acp/templates/cronjobList.tpl       |  8 +++++--
 .../files/acp/templates/languageList.tpl      |  4 +++-
 .../files/acp/templates/menuItemList.tpl      |  4 +++-
 .../install/files/acp/templates/menuList.tpl  |  4 +++-
 .../install/files/acp/templates/package.tpl   | 12 +++++++----
 .../files/acp/templates/packageList.tpl       |  4 +++-
 .../acp/templates/packageUpdateServerList.tpl |  4 +++-
 .../install/files/acp/templates/pageList.tpl  |  4 +++-
 .../templates/paidSubscriptionUserList.tpl    |  4 +++-
 .../files/acp/templates/templateGroupList.tpl |  8 +++++--
 .../files/acp/templates/templateList.tpl      | 12 ++++++++---
 .../files/acp/templates/userGroupList.tpl     |  8 +++++--
 .../acp/templates/userOptionCategoryList.tpl  |  4 +++-
 .../files/acp/templates/userOptionList.tpl    |  4 +++-
 .../files/acp/templates/userTrophyList.tpl    |  8 +++++--
 31 files changed, 161 insertions(+), 49 deletions(-)

diff --git a/com.woltlab.wcf/templates/user.tpl b/com.woltlab.wcf/templates/user.tpl
index 239a3ba4b0..190802ee89 100644
--- a/com.woltlab.wcf/templates/user.tpl
+++ b/com.woltlab.wcf/templates/user.tpl
@@ -171,7 +171,11 @@
 		<div class="contentHeaderTitle">
 			<h1 class="contentTitle">
 				<span class="userProfileUsername">{$user->username}</span>
-				{if $user->banned}<span class="icon icon24 fa-lock jsTooltip jsUserBanned" title="{lang}wcf.user.banned{/lang}"></span>{/if}
+				{if $user->banned}
+					<span class="jsTooltip jsUserBanned" title="{lang}wcf.user.banned{/lang}">
+						{icon size=24 name='lock'}
+					</span>
+				{/if}
 				{if MODULE_USER_RANK}
 					{if $user->getUserTitle()}
 						<span class="badge userTitleBadge{if $user->getRank() && $user->getRank()->cssClassName} {@$user->getRank()->cssClassName}{/if}">{$user->getUserTitle()}</span>
diff --git a/com.woltlab.wcf/templates/userException.tpl b/com.woltlab.wcf/templates/userException.tpl
index 2382c4d7b3..3900056b9b 100644
--- a/com.woltlab.wcf/templates/userException.tpl
+++ b/com.woltlab.wcf/templates/userException.tpl
@@ -10,7 +10,7 @@
 
 <div class="section">
 	<div class="box64 userException">
-		<span class="icon icon64 fa-exclamation-circle userExceptionIcon"></span>
+		{icon size=64 name='circle-exclamation'}
 		<p id="errorMessage" class="fullPageErrorMessage userExceptionMessage" data-exception-class-name="{$exceptionClassName}">
 			{@$message}
 		</p>
diff --git a/com.woltlab.wcf/templates/userInformationHeadline.tpl b/com.woltlab.wcf/templates/userInformationHeadline.tpl
index bf8832024a..e5b7641d92 100644
--- a/com.woltlab.wcf/templates/userInformationHeadline.tpl
+++ b/com.woltlab.wcf/templates/userInformationHeadline.tpl
@@ -1,5 +1,11 @@
 <div class="containerHeadline">
-	<h3>{user object=$user class='username'}{if $user->banned} <span class="icon icon16 fa-lock jsTooltip jsUserBanned" title="{lang}wcf.user.banned{/lang}"></span>{/if}
+	<h3>
+		{user object=$user class='username'}
+		{if $user->banned}
+			<span class="jsTooltip jsUserBanned" title="{lang}wcf.user.banned{/lang}">
+				{icon size=16 name='lock'}
+			</span>
+		{/if}
 		{if MODULE_USER_RANK}
 			{if $user->getUserTitle()}
 				<span class="badge userTitleBadge{if $user->getRank() && $user->getRank()->cssClassName} {@$user->getRank()->cssClassName}{/if}">{$user->getUserTitle()}</span>
diff --git a/com.woltlab.wcf/templates/userNotice.tpl b/com.woltlab.wcf/templates/userNotice.tpl
index 75e56bfadb..fc03e1adfe 100644
--- a/com.woltlab.wcf/templates/userNotice.tpl
+++ b/com.woltlab.wcf/templates/userNotice.tpl
@@ -29,7 +29,9 @@
 			{foreach from=$__wcf->getNoticeHandler()->getVisibleNotices() item='notice'}
 				<div class="{$notice->cssClassName} notice{if $notice->isDismissible} noticeDismissible active{/if}" role="status">
 					{if $notice->isDismissible}
-						<span role="button" tabindex="0" class="icon icon16 fa-times pointer jsDismissNoticeButton jsTooltip" data-object-id="{$notice->noticeID}" title="{lang}wcf.notice.button.dismiss{/lang}"></span>
+						<button class="jsDismissNoticeButton jsTooltip" data-object-id="{$notice->noticeID}" title="{lang}wcf.notice.button.dismiss{/lang}">
+							{icon size=16 name='xmark'}
+						</button>
 					{/if}
 					
 					{@$notice}
diff --git a/wcfsetup/install/files/acp/templates/__bbcodeAttributesFormField.tpl b/wcfsetup/install/files/acp/templates/__bbcodeAttributesFormField.tpl
index 2c35dcf174..e5340c19ad 100644
--- a/wcfsetup/install/files/acp/templates/__bbcodeAttributesFormField.tpl
+++ b/wcfsetup/install/files/acp/templates/__bbcodeAttributesFormField.tpl
@@ -1,6 +1,11 @@
 {capture assign='attributeTemplate'}
 	<section class="section">
-		<h2 class="sectionTitle"><span class="icon icon16 fa-times pointer jsDeleteButton jsTooltip" title="{lang}wcf.global.button.delete{/lang}"></span> <span>{lang __literal=true}wcf.acp.bbcode.numberedAttribute{/lang}</span></h2>
+		<h2 class="sectionTitle">
+			<button type="button" class="jsDeleteButton jsTooltip" title="{lang}wcf.global.button.delete{/lang}">
+				{icon size=16 name='xmark'}
+			</button>
+			<span>{lang __literal=true}wcf.acp.bbcode.numberedAttribute{/lang}</span>
+		</h2>
 		
 		<dl>
 			<dt>
@@ -95,7 +100,12 @@
 		var parentContainer = elById('{@$field->getParent()->getPrefixedId()}Container');
 		
 		var parentTitle = DomTraverse.childBySel(parentContainer, 'h2.sectionTitle');
-		parentTitle.innerHTML = '<span class="icon icon16 fa-plus pointer jsTooltip" id="{@$field->getPrefixedId()}AddAttribute" title="{lang}wcf.global.button.add{/lang}"></span> ' + parentTitle.innerHTML;
+		parentTitle.innerHTML = `
+			<button class="jsTooltip" id="{@$field->getPrefixedId()}AddAttribute" title="{lang}wcf.global.button.add{/lang}">
+				{icon size=16 name='plus'}
+			</button>
+			${parentTitle.innerHTML}
+		`;
 		
 		DomChangeListener.trigger();
 		
@@ -128,7 +138,12 @@
 
 {foreach from=$field->getValue() key=attributeNumber item=attributeData name=bbcodeAttributes}
 	<section class="section">
-		<h2 class="sectionTitle"><span class="icon icon16 fa-times pointer jsDeleteButton jsTooltip" title="{lang}wcf.global.button.delete{/lang}"></span> <span>{lang}wcf.acp.bbcode.numberedAttribute{/lang}</span></h2>
+		<h2 class="sectionTitle">
+			<button class="jsDeleteButton jsTooltip" title="{lang}wcf.global.button.delete{/lang}">
+				{icon size=16 name='xmark'}
+			</button>
+			<span>{lang}wcf.acp.bbcode.numberedAttribute{/lang}</span>
+		</h2>
 		
 		<dl>
 			<dt>
diff --git a/wcfsetup/install/files/acp/templates/__devtoolsMissingLanguageItemStackTrace.tpl b/wcfsetup/install/files/acp/templates/__devtoolsMissingLanguageItemStackTrace.tpl
index 39ef0cd199..bf5d047ce2 100644
--- a/wcfsetup/install/files/acp/templates/__devtoolsMissingLanguageItemStackTrace.tpl
+++ b/wcfsetup/install/files/acp/templates/__devtoolsMissingLanguageItemStackTrace.tpl
@@ -1,4 +1,6 @@
-<span class="icon icon16 fa-align-justify jsTooltip pointer jsOutputFormatToggle" title="{lang}wcf.acp.devtools.missingLanguageItem.stackTrace.toggleOutputFormat{/lang}" style="margin-bottom: 10px"></span>
+<button type="button" class="jsTooltip jsOutputFormatToggle" title="{lang}wcf.acp.devtools.missingLanguageItem.stackTrace.toggleOutputFormat{/lang}" style="margin-bottom: 10px">
+	{icon size=16 name='align-justify'}
+</button>
 
 <pre>{*
 	*}{foreach from=$stackTrace item=stackEntry name=stackEntries}{*
diff --git a/wcfsetup/install/files/acp/templates/__devtoolsProjectInstructionsFormField.tpl b/wcfsetup/install/files/acp/templates/__devtoolsProjectInstructionsFormField.tpl
index 8f3fcd7e21..16c6e767dc 100644
--- a/wcfsetup/install/files/acp/templates/__devtoolsProjectInstructionsFormField.tpl
+++ b/wcfsetup/install/files/acp/templates/__devtoolsProjectInstructionsFormField.tpl
@@ -39,8 +39,12 @@
 			<header class="sectionHeader">
 				<h2 class="sectionTitle">
 					{literal}{if $type === 'update'}{/literal}
-						<span class="icon icon16 fa-pencil pointer jsTooltip" id="{@$field->getPrefixedId()}_instructions{literal}{$instructionsId}{/literal}_editButton" title="{lang}wcf.global.button.edit{/lang}"></span>
-						<span class="icon icon16 fa-times pointer jsTooltip" id="{@$field->getPrefixedId()}_instructions{literal}{$instructionsId}{/literal}_deleteButton" title="{lang}wcf.global.button.delete{/lang}"></span>
+						<button class="jsTooltip" id="{@$field->getPrefixedId()}_instructions{literal}{$instructionsId}{/literal}_editButton" title="{lang}wcf.global.button.edit{/lang}">
+							{icon size=16 name='pencil'}
+						</button>
+						<button class="jsTooltip" id="{@$field->getPrefixedId()}_instructions{literal}{$instructionsId}{/literal}_deleteButton" title="{lang}wcf.global.button.delete{/lang}">
+							{icon size=16 name='xmark'}
+						</button>
 					{literal}{/if}{/literal}
 					{literal}<span class="jsInstructionsTitle">{$sectionTitle}</span>{/literal}
 				</h2>
diff --git a/wcfsetup/install/files/acp/templates/__objectActionDeleteIcon.tpl b/wcfsetup/install/files/acp/templates/__objectActionDeleteIcon.tpl
index 3e9817995a..66b3c838a6 100644
--- a/wcfsetup/install/files/acp/templates/__objectActionDeleteIcon.tpl
+++ b/wcfsetup/install/files/acp/templates/__objectActionDeleteIcon.tpl
@@ -1,5 +1,7 @@
-<span class="icon icon16 fa-times jsObjectAction jsTooltip pointer" {*
+<button type="button" class="jsObjectAction jsTooltip" {*
     *}title="{lang}wcf.global.button.delete{/lang}"  {*
     *}data-object-action="delete" {*
     *}{if $objectActionConfirmMessage}data-confirm-message="{lang __encode=true}{$objectActionConfirmMessage}{/lang}" {/if}{*
-*}></span>
+*}>
+    {icon size=16 name='xmark'}
+</button>
diff --git a/wcfsetup/install/files/acp/templates/__objectActionToogleIcon.tpl b/wcfsetup/install/files/acp/templates/__objectActionToogleIcon.tpl
index b4c22f983c..7b3f4389cf 100644
--- a/wcfsetup/install/files/acp/templates/__objectActionToogleIcon.tpl
+++ b/wcfsetup/install/files/acp/templates/__objectActionToogleIcon.tpl
@@ -1,4 +1,10 @@
-<span class="icon icon16 fa-{if !$object->isDisabled}check-{/if}square-o jsObjectAction jsTooltip pointer" {*
+<button type="button" class="jsObjectAction jsTooltip" {*
     *}title="{lang}wcf.global.button.{if !$object->isDisabled}disable{else}enable{/if}{/lang}" {*
     *}data-object-action="toggle"{*
-*}></span>
+*}>
+    {if $object->isDisabled}
+        {icon size=16 name='square-check'}
+    {else}
+        {icon size=16 name='square'}
+    {/if}
+</button>
diff --git a/wcfsetup/install/files/acp/templates/__optionRewriteTest.tpl b/wcfsetup/install/files/acp/templates/__optionRewriteTest.tpl
index 04043a6d22..e6ce1bdc4f 100644
--- a/wcfsetup/install/files/acp/templates/__optionRewriteTest.tpl
+++ b/wcfsetup/install/files/acp/templates/__optionRewriteTest.tpl
@@ -5,13 +5,13 @@
 			<p>{lang}wcf.acp.option.url_omit_index_php.test.running{/lang}</p>
 		</div>
 		<div id="dialogRewriteTestSuccess" class="box24" style="display: none">
-			<span class="icon icon24 fa-check green"></span>
+			{icon size=24 name='check'}
 			<p>{lang}wcf.acp.option.url_omit_index_php.test.success{/lang}</p>
 		</div>
 		
 		<div id="dialogRewriteTestFailure" style="display: none">
 			<div class="box24">
-				<span class="icon icon24 fa-times red"></span>
+				{icon size=24 name='triangle-exclamation'}
 				<p>{lang}wcf.acp.option.url_omit_index_php.test.failure{/lang}</p>
 			</div>
 			<p>{lang}wcf.acp.option.url_omit_index_php.test.failure.description{/lang}</p>
diff --git a/wcfsetup/install/files/acp/templates/adList.tpl b/wcfsetup/install/files/acp/templates/adList.tpl
index 4e2c149861..022c3fdd86 100644
--- a/wcfsetup/install/files/acp/templates/adList.tpl
+++ b/wcfsetup/install/files/acp/templates/adList.tpl
@@ -39,7 +39,9 @@
 						<a href="{link controller='AdEdit' object=$ad}{/link}">{$ad->adName}</a>
 						
 						<span class="statusDisplay sortableButtonContainer">
-							<span class="icon icon16 fa-arrows sortableNodeHandle"></span>
+							<span class="sortableNodeHandle">
+								{icon size=16 name='arrows-up-down-left-right'}
+							</span>
 							{objectAction action="toggle" isDisabled=$ad->isDisabled}
 							<a href="{link controller='AdEdit' object=$ad}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil'}</a>
 							{objectAction action="delete" objectTitle=$ad->getTitle()}
diff --git a/wcfsetup/install/files/acp/templates/articleList.tpl b/wcfsetup/install/files/acp/templates/articleList.tpl
index 7e2ed5afb6..c49bdf8895 100644
--- a/wcfsetup/install/files/acp/templates/articleList.tpl
+++ b/wcfsetup/install/files/acp/templates/articleList.tpl
@@ -148,7 +148,9 @@
 								<a href="#" class="jsButtonDelete jsTooltip" title="{lang}wcf.global.button.delete{/lang}" data-confirm-message-html="{lang __encode=true}wcf.acp.article.delete.confirmMessage{/lang}"{if !$article->isDeleted} style="display: none"{/if}>{icon size=16 name='xmark'}</a>
 								<a href="#" class="jsButtonTrash jsTooltip" title="{lang}wcf.global.button.trash{/lang}" data-confirm-message-html="{lang __encode=true}wcf.acp.article.trash.confirmMessage{/lang}"{if $article->isDeleted} style="display: none"{/if}>{icon size=16 name='xmark'}</a>
 							{else}
-								<span class="icon icon16 fa-times disabled" title="{lang}wcf.global.button.delete{/lang}"></span>
+								<span class="disabled" title="{lang}wcf.global.button.delete{/lang}">
+									{icon size=16 name='xmark'}
+								</span>
 							{/if}
 							
 							<a href="{$article->getLink()}" title="{lang}wcf.acp.article.button.viewArticle{/lang}" class="jsTooltip">{icon size=16 name='magnifying-glass'}</a>
diff --git a/wcfsetup/install/files/acp/templates/bbcodeAdd.tpl b/wcfsetup/install/files/acp/templates/bbcodeAdd.tpl
index 50a88f127a..fe339cd6e0 100644
--- a/wcfsetup/install/files/acp/templates/bbcodeAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/bbcodeAdd.tpl
@@ -2,7 +2,12 @@
 
 {capture assign='attributeTemplate'}
 	<section class="section">
-		<h2 class="sectionTitle"><span class="icon icon16 fa-times pointer jsDeleteButton jsTooltip" title="{lang}wcf.global.button.delete{/lang}"></span> <span>{lang}wcf.acp.bbcode.attribute{/lang} {ldelim}#$attributeNo}</span></h2>
+		<h2 class="sectionTitle">
+			<button type="button" class="jsDeleteButton jsTooltip" title="{lang}wcf.global.button.delete{/lang}">
+				{icon size=16 name='xmark'}
+			</button>
+			<span>{lang}wcf.acp.bbcode.attribute{/lang} {ldelim}#$attributeNo}</span>
+		</h2>
 		
 		<dl>
 			<dt><label for="attributes[{ldelim}@$attributeNo}][attributeHtml]">{lang}wcf.acp.bbcode.attribute.attributeHtml{/lang}</label></dt>
@@ -207,11 +212,21 @@
 	</div>
 		
 	<section class="section" id="attributeFieldset">
-		<h2 class="sectionTitle"><span class="icon icon16 fa-plus pointer jsAddButton jsTooltip" title="{lang}wcf.global.button.add{/lang}"></span> {lang}wcf.acp.bbcode.attributes{/lang}</h2>
+		<h2 class="sectionTitle">
+			<button type="button" class="jsAddButton jsTooltip" title="{lang}wcf.global.button.add{/lang}">
+				{icon size=16 name='plus'}
+			</button>
+			{lang}wcf.acp.bbcode.attributes{/lang}
+		</h2>
 		
 		{foreach from=$attributes item='attribute'}
 			<section class="section">
-				<h2 class="sectionTitle"><span class="icon icon16 fa-times pointer jsDeleteButton jsTooltip" title="{lang}wcf.global.button.delete{/lang}"></span> <span>{lang}wcf.acp.bbcode.attribute{/lang} {#$attribute->attributeNo}</span></h2>
+				<h2 class="sectionTitle">
+					<button type="button" class="jsDeleteButton jsTooltip" title="{lang}wcf.global.button.delete{/lang}">
+						{icon size=16 name='xmark'}
+					</button>
+					<span>{lang}wcf.acp.bbcode.attribute{/lang} {#$attribute->attributeNo}</span>
+				</h2>
 				
 				<dl{if $errorField == 'attributeHtml'|concat:$attribute->attributeNo} class="formError"{/if}>
 					<dt><label for="attributes[{@$attribute->attributeNo}][attributeHtml]">{lang}wcf.acp.bbcode.attribute.attributeHtml{/lang}</label></dt>
diff --git a/wcfsetup/install/files/acp/templates/bbcodeList.tpl b/wcfsetup/install/files/acp/templates/bbcodeList.tpl
index c5dfd1b27b..94491751ec 100644
--- a/wcfsetup/install/files/acp/templates/bbcodeList.tpl
+++ b/wcfsetup/install/files/acp/templates/bbcodeList.tpl
@@ -41,7 +41,9 @@
 							{if $bbcode->canDelete()}
 								{objectAction action="delete" objectTitle=$bbcode->getTitle()}
 							{else}
-								<span class="icon icon16 fa-times disabled"></span>
+								<span class="disabled" title="{lang}wcf.global.button.delete{/lang}">
+									{icon size=16 name='xmark'}
+								</span>
 							{/if}
 							
 							{event name='rowButtons'}
diff --git a/wcfsetup/install/files/acp/templates/boxList.tpl b/wcfsetup/install/files/acp/templates/boxList.tpl
index 7c71473dd6..1120a0c3cd 100644
--- a/wcfsetup/install/files/acp/templates/boxList.tpl
+++ b/wcfsetup/install/files/acp/templates/boxList.tpl
@@ -122,7 +122,9 @@
 							{if $box->canDelete()}
 								{objectAction action="delete" objectTitle=$box->name}
 							{else}
-								<span class="icon icon16 fa-times disabled" title="{lang}wcf.global.button.delete{/lang}"></span>
+								<span class="disabled" title="{lang}wcf.global.button.delete{/lang}">
+									{icon size=16 name='xmark'}
+								</span>
 							{/if}
 							
 							{event name='rowButtons'}
diff --git a/wcfsetup/install/files/acp/templates/contactSettings.tpl b/wcfsetup/install/files/acp/templates/contactSettings.tpl
index 80d0d14e7c..28893ba8af 100644
--- a/wcfsetup/install/files/acp/templates/contactSettings.tpl
+++ b/wcfsetup/install/files/acp/templates/contactSettings.tpl
@@ -55,7 +55,9 @@
 							{if $option->canDelete()}
 								{objectAction action="delete" objectTitle=$option->getTitle()}
 							{else}
-								<span class="icon icon16 fa-times disabled"></span>
+								<span class="disabled" title="{lang}wcf.global.button.delete{/lang}">
+									{icon size=16 name='xmark'}
+								</span>
 							{/if}
 							
 							{event name='rowButtons'}
@@ -92,7 +94,9 @@
 							{objectAction action="toggle" isDisabled=$recipient->isDisabled}
 							<a href="{link controller='ContactRecipientEdit' id=$recipient->recipientID}{/link}"><span title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip icon icon16 fa-pencil"></a>
 							{if $recipient->originIsSystem}
-								<span class="icon icon16 fa-times disabled"></span>
+								<span class="disabled" title="{lang}wcf.global.button.delete{/lang}">
+									{icon size=16 name='xmark'}
+								</span>
 							{else}
 								{objectAction action="delete" objectTitle=$recipient->getName()}
 							{/if}
diff --git a/wcfsetup/install/files/acp/templates/cronjobList.tpl b/wcfsetup/install/files/acp/templates/cronjobList.tpl
index ccd4978b73..7ac8708bfb 100644
--- a/wcfsetup/install/files/acp/templates/cronjobList.tpl
+++ b/wcfsetup/install/files/acp/templates/cronjobList.tpl
@@ -65,12 +65,16 @@
 								{if $cronjob->isEditable()}
 									<a href="{link controller='CronjobEdit' id=$cronjob->cronjobID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil'}</a>
 								{else}
-									<span class="icon icon16 fa-pencil disabled" title="{lang}wcf.global.button.edit{/lang}"></span>
+									<span class="disabled" title="{lang}wcf.global.button.edit{/lang}">
+										{icon size=16 name='pencil'}
+									</span>
 								{/if}
 								{if $cronjob->isDeletable()}
 									{objectAction action="delete" objectTitle=$cronjob->getDescription()}
 								{else}
-									<span class="icon icon16 fa-times disabled" title="{lang}wcf.global.button.delete{/lang}"></span>
+									<span class="disabled" title="{lang}wcf.global.button.delete{/lang}">
+										{icon size=16 name='xmark'}
+									</span>
 								{/if}
 								
 								{event name='rowButtons'}
diff --git a/wcfsetup/install/files/acp/templates/languageList.tpl b/wcfsetup/install/files/acp/templates/languageList.tpl
index 0ad3713b8a..65ffeab659 100644
--- a/wcfsetup/install/files/acp/templates/languageList.tpl
+++ b/wcfsetup/install/files/acp/templates/languageList.tpl
@@ -55,7 +55,9 @@
 							{if $language->isDeletable()}
 								{objectAction action="delete" objectTitle=$language->languageName}
 							{else}
-								<span class="icon icon16 fa-times disabled" title="{lang}wcf.global.button.delete{/lang}"></span>
+								<span class="disabled" title="{lang}wcf.global.button.delete{/lang}">
+									{icon size=16 name='xmark'}
+								</span>
 							{/if}
 							
 							{event name='rowButtons'}
diff --git a/wcfsetup/install/files/acp/templates/menuItemList.tpl b/wcfsetup/install/files/acp/templates/menuItemList.tpl
index 085b6ee629..129a528c91 100644
--- a/wcfsetup/install/files/acp/templates/menuItemList.tpl
+++ b/wcfsetup/install/files/acp/templates/menuItemList.tpl
@@ -50,7 +50,9 @@
 								{if $menuItemNode->canDelete()}
 									{objectAction action="delete" objectTitle=$menuItemNode->getTitle()}
 								{else}
-									<span class="icon icon16 fa-times disabled" title="{lang}wcf.global.button.delete{/lang}"></span>
+									<span class="disabled" title="{lang}wcf.global.button.delete{/lang}">
+										{icon size=16 name='xmark'}
+									</span>
 								{/if}
 								
 								{event name='itemButtons'}
diff --git a/wcfsetup/install/files/acp/templates/menuList.tpl b/wcfsetup/install/files/acp/templates/menuList.tpl
index 5e4c2124bd..b7d45b1789 100644
--- a/wcfsetup/install/files/acp/templates/menuList.tpl
+++ b/wcfsetup/install/files/acp/templates/menuList.tpl
@@ -43,7 +43,9 @@
 							{if $menu->canDelete()}
 								{objectAction action="delete" objectTitle=$menu->getTitle()}
 							{else}
-								<span class="icon icon16 fa-times disabled" title="{lang}wcf.global.button.delete{/lang}"></span>
+								<span class="disabled" title="{lang}wcf.global.button.delete{/lang}">
+									{icon size=16 name='xmark'}
+								</span>
 							{/if}
 							<a href="{link controller='MenuItemList' id=$menu->menuID}{/link}" title="{lang}wcf.acp.menu.item.list{/lang}" class="jsTooltip">{icon size=16 name='list'}</a>
 							<a href="{link controller='MenuItemAdd'}menuID={@$menu->menuID}{/link}" title="{lang}wcf.acp.menu.item.add{/lang}" class="jsTooltip">{icon size=16 name='plus'}</a>
diff --git a/wcfsetup/install/files/acp/templates/package.tpl b/wcfsetup/install/files/acp/templates/package.tpl
index 446e009cb9..839102ecd3 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="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}">{icon size=16 name='xmark'} <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}">{icon size=16 name='times' type='solid'} <span>{lang}wcf.acp.package.button.uninstall{/lang}</span></button></li>
 					{/if}
 
 					{event name='contentHeaderNavigation'}
@@ -132,7 +132,9 @@
 											{if $requiredPackage->canUninstall()}
 												<span class="icon icon16 fa-times pointer jsTooltip jsUninstallButton" title="{lang}wcf.acp.package.button.uninstall{/lang}" data-object-id="{@$requiredPackage->packageID}" data-confirm-message="{lang __encode=true package=$requiredPackage}wcf.acp.package.uninstallation.confirm{/lang}" data-is-required="{if $requiredPackage->isRequired()}true{else}false{/if}" data-is-application="{if $requiredPackage->isApplication}true{else}false{/if}"></span>
 											{else}
-												<span class="icon icon16 fa-times disabled" title="{lang}wcf.acp.package.button.uninstall{/lang}"></span>
+												<span class="disabled" title="{lang}wcf.acp.package.button.uninstall{/lang}">
+													{icon size=16 name='xmark'}
+												</span>
 											{/if}
 										</td>
 										<td class="columnID">{@$requiredPackage->packageID}</td>
@@ -173,7 +175,9 @@
 											{if $dependentPackage->canUninstall()}
 												<span class="icon icon16 fa-times pointer jsTooltip jsUninstallButton" title="{lang}wcf.acp.package.button.uninstall{/lang}" data-object-id="{@$dependentPackage->packageID}" data-confirm-message="{lang __encode=true package=$dependentPackage}wcf.acp.package.uninstallation.confirm{/lang}" data-is-required="{if $dependentPackage->isRequired()}true{else}false{/if}" data-is-application="{if $dependentPackage->isApplication}true{else}false{/if}"></span>
 											{else}
-												<span class="icon icon16 fa-times disabled" title="{lang}wcf.acp.package.button.uninstall{/lang}"></span>
+												<span class="disabled" title="{lang}wcf.acp.package.button.uninstall{/lang}">
+													{icon size=16 name='xmark'}
+												</span>
 											{/if}
 										</td>
 										<td class="columnID">{@$dependentPackage->packageID}</td>
@@ -201,7 +205,7 @@
 <footer class="contentFooter">
 	<nav class="contentFooterNavigation">
 		<ul>
-			<li><a href="{link controller='PackageList'}{/link}" class="button">{icon size=16 name='list'} <span>{lang}wcf.acp.menu.link.package.list{/lang}</span></a></li>
+			<li><a href="{link controller='PackageList'}{/link}" class="button">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.menu.link.package.list{/lang}</span></a></li>
 			
 			{event name='contentFooterNavigation'}
 		</ul>
diff --git a/wcfsetup/install/files/acp/templates/packageList.tpl b/wcfsetup/install/files/acp/templates/packageList.tpl
index 21cffdd352..3c2929b5b9 100644
--- a/wcfsetup/install/files/acp/templates/packageList.tpl
+++ b/wcfsetup/install/files/acp/templates/packageList.tpl
@@ -99,7 +99,9 @@
 							{if $package->canUninstall()}
 								<span class="icon icon16 fa-times pointer jsUninstallButton jsTooltip" title="{lang}wcf.acp.package.button.uninstall{/lang}" 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>
 							{else}
-								<span class="icon icon16 fa-times disabled" title="{lang}wcf.acp.package.button.uninstall{/lang}"></span>
+								<span class="disabled" title="{lang}wcf.acp.package.button.uninstall{/lang}">
+									{icon size=16 name='xmark'}
+								</span>
 							{/if}
 							
 							{event name='rowButtons'}
diff --git a/wcfsetup/install/files/acp/templates/packageUpdateServerList.tpl b/wcfsetup/install/files/acp/templates/packageUpdateServerList.tpl
index 8f1f561d19..7472214894 100644
--- a/wcfsetup/install/files/acp/templates/packageUpdateServerList.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUpdateServerList.tpl
@@ -50,7 +50,9 @@
 							{if $updateServer->canDelete()}
 								{objectAction action="delete" objectTitle=$updateServer->serverURL}
 							{else}
-								<span class="icon icon16 fa-times disabled" title="{lang}wcf.global.button.delete{/lang}"></span>
+								<span class="disabled" title="{lang}wcf.global.button.delete{/lang}">
+									{icon size=16 name='xmark'}
+								</span>
 							{/if}
 							
 							{event name='itemButtons'}
diff --git a/wcfsetup/install/files/acp/templates/pageList.tpl b/wcfsetup/install/files/acp/templates/pageList.tpl
index 8306cef53e..321df39d0f 100644
--- a/wcfsetup/install/files/acp/templates/pageList.tpl
+++ b/wcfsetup/install/files/acp/templates/pageList.tpl
@@ -128,7 +128,9 @@
 							{if $page->canDelete()}
 								{objectAction action="delete" objectTitle=$page->name}
 							{else}
-								<span class="icon icon16 fa-times disabled" title="{lang}wcf.global.button.delete{/lang}"></span>
+								<span class="disabled" title="{lang}wcf.global.button.delete{/lang}">
+									{icon size=16 name='xmark'}
+								</span>
 							{/if}
 							{if !$page->requireObjectID}
 								<a href="{$page->getLink()}" title="{lang}wcf.acp.page.button.viewPage{/lang}" class="jsTooltip">{icon size=16 name='magnifying-glass'}</a>
diff --git a/wcfsetup/install/files/acp/templates/paidSubscriptionUserList.tpl b/wcfsetup/install/files/acp/templates/paidSubscriptionUserList.tpl
index 0e7994da66..0858e789ae 100644
--- a/wcfsetup/install/files/acp/templates/paidSubscriptionUserList.tpl
+++ b/wcfsetup/install/files/acp/templates/paidSubscriptionUserList.tpl
@@ -87,7 +87,9 @@
 							{if $subscriptionUser->endDate}
 								<a href="{link controller='PaidSubscriptionUserEdit' id=$subscriptionUser->subscriptionUserID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil'}</a>
 							{else}
-								<span class="icon icon16 fa-pencil disabled"></span>
+								<span class="disabled" title="{lang}wcf.global.button.edit{/lang}">
+									{icon size=16 name='pencil'}
+								</span>
 							{/if}
 							{objectAction action="delete" confirmMessage='wcf.acp.paidSubscription.user.delete.confirmMessage'}
 							
diff --git a/wcfsetup/install/files/acp/templates/templateGroupList.tpl b/wcfsetup/install/files/acp/templates/templateGroupList.tpl
index 76a91970d6..ae2707f842 100644
--- a/wcfsetup/install/files/acp/templates/templateGroupList.tpl
+++ b/wcfsetup/install/files/acp/templates/templateGroupList.tpl
@@ -40,7 +40,9 @@
 					<tr class="jsTemplateGroupRow jsObjectActionObject" data-object-id="{@$templateGroup->getObjectID()}">
 						<td class="columnIcon">
 							{if $templateGroup->isImmutable()}
-								<span class="icon icon16 fa-pencil disabled" title="{lang}wcf.global.button.edit{/lang}"></span>
+								<span class="disabled" title="{lang}wcf.global.button.edit{/lang}">
+									{icon size=16 name='pencil'}
+								</span>
 							{else}
 								<a href="{link controller='TemplateGroupEdit' id=$templateGroup->templateGroupID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil'}</a>
 							{/if}
@@ -48,7 +50,9 @@
 							<a href="{link controller='TemplateList' templateGroupID=$templateGroup->templateGroupID}{/link}" title="{lang}wcf.acp.template.list{/lang}" class="jsTooltip">{icon size=16 name='list'}</a>
 							
 							{if $templateGroup->isImmutable()}
-								<span class="icon icon16 fa-times disabled" title="{lang}wcf.global.button.delete{/lang}"></span>
+								<span class="disabled" title="{lang}wcf.global.button.delete{/lang}">
+									{icon size=16 name='xmark'}
+								</span>
 							{else}
 								{objectAction action="delete" objectTitle=$templateGroup->getName()}
 							{/if}
diff --git a/wcfsetup/install/files/acp/templates/templateList.tpl b/wcfsetup/install/files/acp/templates/templateList.tpl
index 79695a890d..1e3b5e4d3a 100644
--- a/wcfsetup/install/files/acp/templates/templateList.tpl
+++ b/wcfsetup/install/files/acp/templates/templateList.tpl
@@ -102,9 +102,15 @@
 									<a href="{link controller='TemplateEdit' id=$template->templateID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil'}</a>
 									{objectAction action="delete" objectTitle=$template->templateName}
 								{else}
-									<span class="icon icon16 fa-exchange disabled" title="{lang}wcf.acp.template.diff{/lang}"></span>
-									<span class="icon icon16 fa-pencil disabled" title="{lang}wcf.global.button.edit{/lang}"></span>
-									<span class="icon icon16 fa-times disabled" title="{lang}wcf.global.button.delete{/lang}"></span>
+									<span class="disabled" title="{lang}wcf.acp.template.diff{/lang}">
+										{icon size=16 name='arrow-right-arrow-left'}
+									</span>
+									<span class="disabled" title="{lang}wcf.global.button.edit{/lang}">
+										{icon size=16 name='pencil'}
+									</span>
+									<span class="disabled" title="{lang}wcf.global.button.delete{/lang}">
+										{icon size=16 name='xmark'}
+									</span>
 								{/if}
 								
 								{event name='rowButtons'}
diff --git a/wcfsetup/install/files/acp/templates/userGroupList.tpl b/wcfsetup/install/files/acp/templates/userGroupList.tpl
index 52db0db969..42958139ea 100644
--- a/wcfsetup/install/files/acp/templates/userGroupList.tpl
+++ b/wcfsetup/install/files/acp/templates/userGroupList.tpl
@@ -46,12 +46,16 @@
 						{if $group->isEditable()}
 							<a href="{link controller='UserGroupEdit' id=$group->groupID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil'}</a>
 						{else}
-							<span class="icon icon16 fa-pencil disabled" title="{lang}wcf.global.button.edit{/lang}"></span>
+							<span class="disabled" title="{lang}wcf.global.button.edit{/lang}">
+								{icon size=16 name='pencil'}
+							</span>
 						{/if}
 						{if $group->isDeletable()}
 							{objectAction action="delete" objectTitle=$group->getTitle()}
 						{else}
-							<span class="icon icon16 fa-times disabled" title="{lang}wcf.global.button.delete{/lang}"></span>
+							<span class="disabled" title="{lang}wcf.global.button.delete{/lang}">
+								{icon size=16 name='xmark'}
+							</span>
 						{/if}
 						
 						{event name='rowButtons'}
diff --git a/wcfsetup/install/files/acp/templates/userOptionCategoryList.tpl b/wcfsetup/install/files/acp/templates/userOptionCategoryList.tpl
index 02ef5af2ad..661b24ac21 100644
--- a/wcfsetup/install/files/acp/templates/userOptionCategoryList.tpl
+++ b/wcfsetup/install/files/acp/templates/userOptionCategoryList.tpl
@@ -41,7 +41,9 @@
 						<td class="columnIcon">
 							<a href="{link controller='UserOptionCategoryEdit' id=$category->categoryID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil'}</a>
 							{if $category->userOptions > 0}
-								<span class="icon icon16 fa-times disabled"></span>
+								<span class="disabled" title="{lang}wcf.global.button.delete{/lang}">
+									{icon size=16 name='xmark'}
+								</span>
 							{else}
 								{objectAction action="delete" objectTitle=$category->getTitle()}
 							{/if}
diff --git a/wcfsetup/install/files/acp/templates/userOptionList.tpl b/wcfsetup/install/files/acp/templates/userOptionList.tpl
index c2e90d993f..40a0a720b4 100644
--- a/wcfsetup/install/files/acp/templates/userOptionList.tpl
+++ b/wcfsetup/install/files/acp/templates/userOptionList.tpl
@@ -44,7 +44,9 @@
 							{if $option->canDelete()}
 								{objectAction action="delete" objectTitle=$option->getTitle()}
 							{else}
-								<span class="icon icon16 fa-times disabled"></span>
+								<span class="disabled" title="{lang}wcf.global.button.delete{/lang}">
+									{icon size=16 name='xmark'}
+								</span>
 							{/if}
 							
 							{event name='rowButtons'}
diff --git a/wcfsetup/install/files/acp/templates/userTrophyList.tpl b/wcfsetup/install/files/acp/templates/userTrophyList.tpl
index 9b19cf9534..7d52e1ed67 100644
--- a/wcfsetup/install/files/acp/templates/userTrophyList.tpl
+++ b/wcfsetup/install/files/acp/templates/userTrophyList.tpl
@@ -92,8 +92,12 @@
 					<tr class="userTrophyRow jsObjectActionObject" data-object-id="{@$userTrophy->getObjectID()}">
 						<td class="columnIcon">
 							{if $userTrophy->getTrophy()->awardAutomatically}
-								<span class="icon icon16 fa-pencil disabled" title="{lang}wcf.global.button.edit{/lang}"></span>
-								<span class="icon icon16 fa-times disabled" title="{lang}wcf.global.button.delete{/lang}"></span>
+								<span class="disabled" title="{lang}wcf.global.button.edit{/lang}">
+									{icon size=16 name='pencil'}
+								</span>
+								<span class="disabled" title="{lang}wcf.global.button.delete{/lang}">
+									{icon size=16 name='xmark'}
+								</span>
 							{else}
 								<a href="{link controller='UserTrophyEdit' id=$userTrophy->userTrophyID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 fa-pencil{if $userTrophy->getTrophy()->awardAutomatically} disabled{/if}"></span></a>
 								{objectAction action="delete" confirmMessage='wcf.acp.trophy.userTrophy.delete.confirmMessage'}
-- 
2.20.1