From 813b710fe010b5a61a535f3f2384f5be4d529ee7 Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Fri, 12 Aug 2022 16:36:28 +0200
Subject: [PATCH] Replace legacy icons in ACP templates

---
 .../templates/__bbcodeAttributesFormField.tpl | 16 +++++-----
 .../acp/templates/__booleanFormField.tpl      |  4 +--
 .../files/acp/templates/__boxAddContent.tpl   |  4 +--
 .../acp/templates/__optionRewriteTest.tpl     |  2 +-
 .../files/acp/templates/__pageAddContent.tpl  |  4 +--
 .../install/files/acp/templates/aclSimple.tpl | 12 ++++----
 .../files/acp/templates/acpSessionLog.tpl     |  4 +--
 .../install/files/acp/templates/adAdd.tpl     |  2 +-
 .../install/files/acp/templates/adList.tpl    |  6 ++--
 .../files/acp/templates/articleAdd.tpl        | 12 ++++----
 .../files/acp/templates/articleList.tpl       | 18 +++++------
 .../install/files/acp/templates/bbcodeAdd.tpl |  4 +--
 .../files/acp/templates/bbcodeList.tpl        |  6 ++--
 .../acp/templates/bbcodeMediaProviderAdd.tpl  |  2 +-
 .../acp/templates/bbcodeMediaProviderList.tpl |  6 ++--
 .../files/acp/templates/booleanOptionType.tpl |  4 +--
 .../templates/booleanSearchableOptionType.tpl |  4 +--
 .../install/files/acp/templates/boxAdd.tpl    |  6 ++--
 .../install/files/acp/templates/boxList.tpl   |  6 ++--
 .../install/files/acp/templates/cacheList.tpl |  6 ++--
 .../acp/templates/captchaQuestionAdd.tpl      |  2 +-
 .../acp/templates/captchaQuestionList.tpl     |  6 ++--
 .../files/acp/templates/categoryAdd.tpl       |  4 +--
 .../files/acp/templates/categoryList.tpl      |  4 +--
 .../files/acp/templates/contactOptionAdd.tpl  |  2 +-
 .../acp/templates/contactRecipientAdd.tpl     |  2 +-
 .../files/acp/templates/contactSettings.tpl   |  6 ++--
 .../files/acp/templates/cronjobAdd.tpl        |  2 +-
 .../files/acp/templates/cronjobList.tpl       |  6 ++--
 .../files/acp/templates/cronjobLogList.tpl    |  4 +--
 .../devtoolsMissingLanguageItemList.tpl       |  4 +--
 .../acp/templates/devtoolsProjectAdd.tpl      |  6 ++--
 .../acp/templates/devtoolsProjectList.tpl     |  8 ++---
 .../templates/devtoolsProjectPipEntryAdd.tpl  |  4 +--
 .../templates/devtoolsProjectPipEntryList.tpl | 14 ++++-----
 .../acp/templates/devtoolsProjectPipList.tpl  | 14 ++++-----
 .../acp/templates/devtoolsProjectSync.tpl     |  6 ++--
 .../files/acp/templates/firstTimeSetup.tpl    |  2 +-
 .../install/files/acp/templates/labelAdd.tpl  |  2 +-
 .../files/acp/templates/labelGroupAdd.tpl     |  4 +--
 .../files/acp/templates/labelGroupList.tpl    |  6 ++--
 .../install/files/acp/templates/labelList.tpl |  6 ++--
 .../files/acp/templates/languageAdd.tpl       |  2 +-
 .../files/acp/templates/languageExport.tpl    |  2 +-
 .../files/acp/templates/languageImport.tpl    |  2 +-
 .../files/acp/templates/languageItemAdd.tpl   |  2 +-
 .../files/acp/templates/languageItemList.tpl  |  2 +-
 .../files/acp/templates/languageList.tpl      | 12 ++++----
 .../files/acp/templates/mediaEditor.tpl       |  2 +-
 .../install/files/acp/templates/mediaList.tpl |  2 +-
 .../install/files/acp/templates/menuAdd.tpl   |  4 +--
 .../files/acp/templates/menuItemAdd.tpl       |  6 ++--
 .../files/acp/templates/menuItemList.tpl      |  6 ++--
 .../install/files/acp/templates/menuList.tpl  | 10 +++----
 .../files/acp/templates/messageFormTabs.tpl   |  2 +-
 .../install/files/acp/templates/noticeAdd.tpl |  2 +-
 .../files/acp/templates/noticeList.tpl        |  6 ++--
 .../templates/notificationPresetSettings.tpl  |  2 +-
 .../install/files/acp/templates/package.tpl   |  4 +--
 .../packageEnableUpgradeOverride.tpl          |  2 +-
 .../files/acp/templates/packageList.tpl       |  6 ++--
 .../packageSearchResultListItems.tpl          |  2 +-
 .../acp/templates/packageStartInstall.tpl     |  8 ++---
 .../acp/templates/packageUpdateServerAdd.tpl  |  2 +-
 .../acp/templates/packageUpdateServerList.tpl |  6 ++--
 .../install/files/acp/templates/pageAdd.tpl   |  8 ++---
 .../files/acp/templates/pageBoxOrder.tpl      |  4 +--
 .../files/acp/templates/pageHeaderUser.tpl    |  6 ++--
 .../install/files/acp/templates/pageList.tpl  |  8 ++---
 .../acp/templates/paidSubscriptionAdd.tpl     |  2 +-
 .../acp/templates/paidSubscriptionList.tpl    |  8 ++---
 .../paidSubscriptionTransactionLog.tpl        |  4 +--
 .../acp/templates/paidSubscriptionUserAdd.tpl |  4 +--
 .../templates/paidSubscriptionUserList.tpl    |  2 +-
 .../files/acp/templates/reactionTypeAdd.tpl   |  2 +-
 .../files/acp/templates/reactionTypeList.tpl  |  2 +-
 .../files/acp/templates/rebuildData.tpl       |  2 +-
 .../files/acp/templates/sitemapEdit.tpl       |  2 +-
 .../files/acp/templates/sitemapList.tpl       |  4 +--
 .../install/files/acp/templates/smileyAdd.tpl |  2 +-
 .../files/acp/templates/smileyList.tpl        |  2 +-
 .../install/files/acp/templates/styleAdd.tpl  | 30 +++++++++----------
 .../files/acp/templates/styleExport.tpl       |  2 +-
 .../files/acp/templates/styleGlobalValues.tpl |  2 +-
 .../files/acp/templates/styleImport.tpl       |  2 +-
 .../install/files/acp/templates/styleList.tpl | 16 +++++-----
 .../install/files/acp/templates/tagAdd.tpl    |  2 +-
 .../install/files/acp/templates/tagList.tpl   |  6 ++--
 .../files/acp/templates/templateAdd.tpl       |  4 +--
 .../files/acp/templates/templateDiff.tpl      |  4 +--
 .../files/acp/templates/templateGroupAdd.tpl  |  4 +--
 .../files/acp/templates/templateGroupList.tpl |  8 ++---
 .../files/acp/templates/templateList.tpl      | 10 +++----
 .../install/files/acp/templates/trophyAdd.tpl |  8 ++---
 .../files/acp/templates/trophyList.tpl        |  6 ++--
 .../acp/templates/userActivityPointOption.tpl |  2 +-
 .../install/files/acp/templates/userAdd.tpl   |  4 +--
 .../files/acp/templates/userGroupAdd.tpl      |  8 ++---
 .../acp/templates/userGroupAssignmentAdd.tpl  |  2 +-
 .../acp/templates/userGroupAssignmentList.tpl |  6 ++--
 .../templates/userGroupBooleanOptionType.tpl  |  6 ++--
 .../files/acp/templates/userGroupList.tpl     |  6 ++--
 .../install/files/acp/templates/userList.tpl  |  8 ++---
 .../install/files/acp/templates/userMail.tpl  |  4 +--
 .../files/acp/templates/userOptionAdd.tpl     |  2 +-
 .../acp/templates/userOptionCategoryAdd.tpl   |  2 +-
 .../acp/templates/userOptionCategoryList.tpl  |  6 ++--
 .../files/acp/templates/userOptionList.tpl    |  6 ++--
 .../files/acp/templates/userRankAdd.tpl       |  2 +-
 .../files/acp/templates/userRankList.tpl      |  8 ++---
 .../files/acp/templates/userSearch.tpl        |  2 +-
 .../files/acp/templates/userTrophyAdd.tpl     |  2 +-
 .../files/acp/templates/userTrophyList.tpl    |  4 +--
 .../acp/templates/versionTrackerList.tpl      |  4 +--
 .../install/files/acp/templates/worker.tpl    |  2 +-
 115 files changed, 294 insertions(+), 294 deletions(-)

diff --git a/wcfsetup/install/files/acp/templates/__bbcodeAttributesFormField.tpl b/wcfsetup/install/files/acp/templates/__bbcodeAttributesFormField.tpl
index e04fc99110..2f21be1f9b 100644
--- a/wcfsetup/install/files/acp/templates/__bbcodeAttributesFormField.tpl
+++ b/wcfsetup/install/files/acp/templates/__bbcodeAttributesFormField.tpl
@@ -34,7 +34,7 @@
 							*}data-no-input-id="{@$field->getPrefixedId()}_required_{ldelim}@$attributeNumber}_no"{*
 						*}>
 						<label for="{@$field->getPrefixedId()}_required_{ldelim}@$attributeNumber}" class="green">
-							<span class="icon icon16 fa-check"></span> {lang}wcf.global.form.boolean.yes{/lang}
+							{icon size=16 name='check' type='solid'} {lang}wcf.global.form.boolean.yes{/lang}
 						</label>
 					</li>
 					<li>
@@ -46,7 +46,7 @@
 							*}checked{*
 						*}>
 						<label for="{@$field->getPrefixedId()}_required_{ldelim}@$attributeNumber}_no" class="red">
-							<span class="icon icon16 fa-times"></span> {lang}wcf.global.form.boolean.no{/lang}
+							{icon size=16 name='times' type='solid'} {lang}wcf.global.form.boolean.no{/lang}
 						</label>
 					</li>
 				</ol>
@@ -67,7 +67,7 @@
 							*}data-no-input-id="{@$field->getPrefixedId()}_useText_{ldelim}@$attributeNumber}_no"{*
 						*}>
 						<label for="{@$field->getPrefixedId()}_useText_{ldelim}@$attributeNumber}" class="green">
-							<span class="icon icon16 fa-check"></span> {lang}wcf.global.form.boolean.yes{/lang}
+							{icon size=16 name='check' type='solid'} {lang}wcf.global.form.boolean.yes{/lang}
 						</label>
 					</li>
 					<li>
@@ -79,7 +79,7 @@
 							*}checked{*
 						*}>
 						<label for="{@$field->getPrefixedId()}_useText_{ldelim}@$attributeNumber}_no" class="red">
-							<span class="icon icon16 fa-times"></span> {lang}wcf.global.form.boolean.no{/lang}
+							{icon size=16 name='times' type='solid'} {lang}wcf.global.form.boolean.no{/lang}
 						</label>
 					</li>
 				</ol>
@@ -172,7 +172,7 @@
 							*}{if !$attributeData[required]|empty} checked{/if}{*
 						*}>
 						<label for="{@$field->getPrefixedId()}_required_{@$attributeNumber}" class="green">
-							<span class="icon icon16 fa-check"></span> {lang}wcf.global.form.boolean.yes{/lang}
+							{icon size=16 name='check' type='solid'} {lang}wcf.global.form.boolean.yes{/lang}
 						</label>
 					</li>
 					<li>
@@ -184,7 +184,7 @@
 							*}{if $attributeData[required]|empty} checked{/if}{*
 						*}>
 						<label for="{@$field->getPrefixedId()}_required_{@$attributeNumber}_no" class="red">
-							<span class="icon icon16 fa-times"></span> {lang}wcf.global.form.boolean.no{/lang}
+							{icon size=16 name='times' type='solid'} {lang}wcf.global.form.boolean.no{/lang}
 						</label>
 					</li>
 				</ol>
@@ -206,7 +206,7 @@
 							*}{if !$attributeData[useText]|empty} checked{/if}{*
 						*}>
 						<label for="{@$field->getPrefixedId()}_useText_{@$attributeNumber}" class="green">
-							<span class="icon icon16 fa-check"></span> {lang}wcf.global.form.boolean.yes{/lang}
+							{icon size=16 name='check' type='solid'} {lang}wcf.global.form.boolean.yes{/lang}
 						</label>
 					</li>
 					<li>
@@ -218,7 +218,7 @@
 							*}{if $attributeData[useText]|empty} checked{/if}{*
 						*}>
 						<label for="{@$field->getPrefixedId()}_useText_{@$attributeNumber}_no" class="red">
-							<span class="icon icon16 fa-times"></span> {lang}wcf.global.form.boolean.no{/lang}
+							{icon size=16 name='times' type='solid'} {lang}wcf.global.form.boolean.no{/lang}
 						</label>
 					</li>
 				</ol>
diff --git a/wcfsetup/install/files/acp/templates/__booleanFormField.tpl b/wcfsetup/install/files/acp/templates/__booleanFormField.tpl
index 9acc4daa2e..c3b8421333 100644
--- a/wcfsetup/install/files/acp/templates/__booleanFormField.tpl
+++ b/wcfsetup/install/files/acp/templates/__booleanFormField.tpl
@@ -12,7 +12,7 @@
 			*}{if $field->getValue()} checked{/if}{*
 			*}{foreach from=$field->getFieldAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}{*
 		*}>
-		<label for="{@$field->getPrefixedId()}" class="green"><span class="icon icon16 fa-check"></span> {lang}wcf.global.form.boolean.yes{/lang}</label>
+		<label for="{@$field->getPrefixedId()}" class="green">{icon size=16 name='check' type='solid'} {lang}wcf.global.form.boolean.yes{/lang}</label>
 	</li>
 	<li>
 		<input type="radio" {*
@@ -24,6 +24,6 @@
 			*}{if !$field->getValue()} checked{/if}{*
 			*}{foreach from=$field->getFieldAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}{*
 		*}>
-		<label for="{@$field->getPrefixedId()}_no" class="red"><span class="icon icon16 fa-times"></span> {lang}wcf.global.form.boolean.no{/lang}</label>
+		<label for="{@$field->getPrefixedId()}_no" class="red">{icon size=16 name='times' type='solid'} {lang}wcf.global.form.boolean.no{/lang}</label>
 	</li>
 </ol>
diff --git a/wcfsetup/install/files/acp/templates/__boxAddContent.tpl b/wcfsetup/install/files/acp/templates/__boxAddContent.tpl
index cf7319cad9..e3fb2c007a 100644
--- a/wcfsetup/install/files/acp/templates/__boxAddContent.tpl
+++ b/wcfsetup/install/files/acp/templates/__boxAddContent.tpl
@@ -1,7 +1,7 @@
 {if $boxType == 'html' || $boxType == 'tpl'}
 	<ul class="codemirrorToolbar">
-		<li><a href="#" id="codemirror-content{@$languageID}-media" class="jsTooltip" title="{lang}wcf.editor.button.media{/lang}"><span class="icon icon16 fa-file-o"></span></a></li>
-		<li><a href="#" id="codemirror-content{@$languageID}-page" class="jsTooltip" title="{lang}wcf.editor.button.page{/lang}"><span class="icon icon16 fa-file-text-o"></span></a></li>
+		<li><a href="#" id="codemirror-content{@$languageID}-media" class="jsTooltip" title="{lang}wcf.editor.button.media{/lang}">{icon size=16 name='file'}</a></li>
+		<li><a href="#" id="codemirror-content{@$languageID}-page" class="jsTooltip" title="{lang}wcf.editor.button.page{/lang}">{icon size=16 name='file-lines'}</a></li>
 	</ul>
 	<script data-relocate="true">
 		require([
diff --git a/wcfsetup/install/files/acp/templates/__optionRewriteTest.tpl b/wcfsetup/install/files/acp/templates/__optionRewriteTest.tpl
index b30b947cb0..1708839ef2 100644
--- a/wcfsetup/install/files/acp/templates/__optionRewriteTest.tpl
+++ b/wcfsetup/install/files/acp/templates/__optionRewriteTest.tpl
@@ -1,7 +1,7 @@
 {if $category->categoryName === 'general'}
 	<div id="dialogRewriteTest" style="display: none">
 		<div id="dialogRewriteTestRunning" class="box24">
-			<span class="icon icon24 fa-spinner"></span>
+			{icon size=24 name='spinner' type='solid'}
 			<p>{lang}wcf.acp.option.url_omit_index_php.test.running{/lang}</p>
 		</div>
 		<div id="dialogRewriteTestSuccess" class="box24" style="display: none">
diff --git a/wcfsetup/install/files/acp/templates/__pageAddContent.tpl b/wcfsetup/install/files/acp/templates/__pageAddContent.tpl
index bbcdea079b..3c1982f54f 100644
--- a/wcfsetup/install/files/acp/templates/__pageAddContent.tpl
+++ b/wcfsetup/install/files/acp/templates/__pageAddContent.tpl
@@ -2,8 +2,8 @@
 
 {if $pageType == 'html' || $pageType == 'tpl'}
 	<ul class="codemirrorToolbar">
-		<li><a href="#" id="codemirror-{@$__pageContentID}-media" class="jsTooltip" title="{lang}wcf.editor.button.media{/lang}"><span class="icon icon16 fa-file-o"></span></a></li>
-		<li><a href="#" id="codemirror-{@$__pageContentID}-page" class="jsTooltip" title="{lang}wcf.editor.button.page{/lang}"><span class="icon icon16 fa-file-text-o"></span></a></li>
+		<li><a href="#" id="codemirror-{@$__pageContentID}-media" class="jsTooltip" title="{lang}wcf.editor.button.media{/lang}">{icon size=16 name='file'}</a></li>
+		<li><a href="#" id="codemirror-{@$__pageContentID}-page" class="jsTooltip" title="{lang}wcf.editor.button.page{/lang}">{icon size=16 name='file-lines'}</a></li>
 	</ul>
 	<script data-relocate="true">
 		{include file='mediaJavaScript'}
diff --git a/wcfsetup/install/files/acp/templates/aclSimple.tpl b/wcfsetup/install/files/acp/templates/aclSimple.tpl
index ca12024b23..8c49e69801 100644
--- a/wcfsetup/install/files/acp/templates/aclSimple.tpl
+++ b/wcfsetup/install/files/acp/templates/aclSimple.tpl
@@ -9,11 +9,11 @@
 			<ol role="group" aria-label="{lang}wcf.acl.allowAll{/lang}" class="flexibleButtonGroup">
 				<li>
 					<input type="radio" id="{@$__aclSimplePrefix}aclAllowAll" name="{@$__aclInputName}[allowAll]" value="1"{if $aclValues[allowAll]} checked{/if}>
-					<label for="{@$__aclSimplePrefix}aclAllowAll" class="green"><span class="icon icon16 fa-check"></span> {lang}wcf.acp.option.type.boolean.yes{/lang}</label>
+					<label for="{@$__aclSimplePrefix}aclAllowAll" class="green">{icon size=16 name='check' type='solid'} {lang}wcf.acp.option.type.boolean.yes{/lang}</label>
 				</li>
 				<li>
 					<input type="radio" id="{@$__aclSimplePrefix}aclAllowAll_no" name="{@$__aclInputName}[allowAll]" value="0"{if !$aclValues[allowAll]} checked{/if}>
-					<label for="{@$__aclSimplePrefix}aclAllowAll_no" class="red"><span class="icon icon16 fa-times"></span> {lang}wcf.acp.option.type.boolean.no{/lang}</label>
+					<label for="{@$__aclSimplePrefix}aclAllowAll_no" class="red">{icon size=16 name='times' type='solid'} {lang}wcf.acp.option.type.boolean.no{/lang}</label>
 				</li>
 			</ol>
 		</dd>
@@ -27,11 +27,11 @@
 				<ol class="flexibleButtonGroup">
 					<li>
 						<input type="radio" id="{@$__aclSimplePrefix}invertPermissions" name="{@$__aclSimplePrefix}invertPermissions" value="1"{if $invertPermissions} checked{/if}>
-						<label for="{@$__aclSimplePrefix}invertPermissions" class="green"><span class="icon icon16 fa-check"></span> {lang}wcf.acp.option.type.boolean.yes{/lang}</label>
+						<label for="{@$__aclSimplePrefix}invertPermissions" class="green">{icon size=16 name='check' type='solid'} {lang}wcf.acp.option.type.boolean.yes{/lang}</label>
 					</li>
 					<li>
 						<input type="radio" id="{@$__aclSimplePrefix}invertPermissions_no" name="{@$__aclSimplePrefix}invertPermissions" value="0"{if !$invertPermissions} checked{/if}>
-						<label for="{@$__aclSimplePrefix}invertPermissions_no" class="red"><span class="icon icon16 fa-times"></span> {lang}wcf.acp.option.type.boolean.no{/lang}</label>
+						<label for="{@$__aclSimplePrefix}invertPermissions_no" class="red">{icon size=16 name='times' type='solid'} {lang}wcf.acp.option.type.boolean.no{/lang}</label>
 					</li>
 				</ol>
 				<small>{lang}wcf.acl.access.invertPermissions.description{/lang}</small>
@@ -55,7 +55,7 @@
 			<ul id="{@$__aclSimplePrefix}aclAccessList" class="aclList containerList">
 				{foreach from=$aclValues[group] item=aclGroup}
 					<li>
-						<span class="icon icon16 fa-users"></span>
+						{icon size=16 name='users' type='solid'}
 						<span class="aclLabel">{$aclGroup}</span>
 						<span class="icon icon16 fa-times pointer jsTooltip" title="{lang}wcf.global.button.delete{/lang}"></span>
 						<input type="hidden" name="{@$__aclInputName}[group][]" value="{@$aclGroup->groupID}">
@@ -63,7 +63,7 @@
 				{/foreach}
 				{foreach from=$aclValues[user] item=aclUser}
 					<li>
-						<span class="icon icon16 fa-user"></span>
+						{icon size=16 name='user' type='solid'}
 						<span class="aclLabel">{$aclUser}</span>
 						<span class="icon icon16 fa-times pointer jsTooltip" title="{lang}wcf.global.button.delete{/lang}"></span>
 						<input type="hidden" name="{@$__aclInputName}[user][]" value="{@$aclUser->userID}">
diff --git a/wcfsetup/install/files/acp/templates/acpSessionLog.tpl b/wcfsetup/install/files/acp/templates/acpSessionLog.tpl
index bb91145a2d..3b4706b0e4 100644
--- a/wcfsetup/install/files/acp/templates/acpSessionLog.tpl
+++ b/wcfsetup/install/files/acp/templates/acpSessionLog.tpl
@@ -7,7 +7,7 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='ACPSessionLogList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.sessionLog.list{/lang}</span></a></li>
+			<li><a href="{link controller='ACPSessionLogList'}{/link}" class="button">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.sessionLog.list{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
@@ -62,7 +62,7 @@
 		
 		<nav class="contentFooterNavigation">
 			<ul>
-				<li><a href="{link controller='ACPSessionLogList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.sessionLog.list{/lang}</span></a></li>
+				<li><a href="{link controller='ACPSessionLogList'}{/link}" class="button">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.sessionLog.list{/lang}</span></a></li>
 				
 				{event name='contentFooterNavigation'}
 			</ul>
diff --git a/wcfsetup/install/files/acp/templates/adAdd.tpl b/wcfsetup/install/files/acp/templates/adAdd.tpl
index 0a8fb5946a..4985b1d15a 100644
--- a/wcfsetup/install/files/acp/templates/adAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/adAdd.tpl
@@ -15,7 +15,7 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='AdList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.ad.list{/lang}</span></a></li>
+			<li><a href="{link controller='AdList'}{/link}" class="button">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.menu.link.ad.list{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
diff --git a/wcfsetup/install/files/acp/templates/adList.tpl b/wcfsetup/install/files/acp/templates/adList.tpl
index d0362a7ce0..61d85f091b 100644
--- a/wcfsetup/install/files/acp/templates/adList.tpl
+++ b/wcfsetup/install/files/acp/templates/adList.tpl
@@ -17,7 +17,7 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='AdAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.menu.link.ad.add{/lang}</span></a></li>
+			<li><a href="{link controller='AdAdd'}{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.menu.link.ad.add{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
@@ -41,7 +41,7 @@
 						<span class="statusDisplay sortableButtonContainer">
 							<span class="icon icon16 fa-arrows sortableNodeHandle"></span>
 							{objectAction action="toggle" isDisabled=$ad->isDisabled}
-							<a href="{link controller='AdEdit' object=$ad}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 fa-pencil"></span></a>
+							<a href="{link controller='AdEdit' object=$ad}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil' type='solid'}</a>
 							{objectAction action="delete" objectTitle=$ad->getTitle()}
 							
 							{event name='itemButtons'}
@@ -65,7 +65,7 @@
 		
 		<nav class="contentFooterNavigation">
 			<ul>
-				<li><a href="{link controller='AdAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.menu.link.ad.add{/lang}</span></a></li>
+				<li><a href="{link controller='AdAdd'}{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.menu.link.ad.add{/lang}</span></a></li>
 				
 				{event name='contentFooterNavigation'}
 			</ul>
diff --git a/wcfsetup/install/files/acp/templates/articleAdd.tpl b/wcfsetup/install/files/acp/templates/articleAdd.tpl
index 86e3dd406c..b4c4ce3d48 100644
--- a/wcfsetup/install/files/acp/templates/articleAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/articleAdd.tpl
@@ -14,16 +14,16 @@
 			<ul>
 				{if $action == 'edit'}
 					{if $article->canDelete()}
-						<li><a href="#" class="button jsButtonRestore" data-confirm-message-html="{lang __encode=true isArticleEdit=true}wcf.acp.article.restore.confirmMessage{/lang}"{if !$article->isDeleted} style="display: none"{/if}><span class="icon icon16 fa-refresh"></span> <span>{lang}wcf.global.button.restore{/lang}</span></a></li>
-						<li><a href="#" class="button jsButtonDelete" data-confirm-message-html="{lang __encode=true isArticleEdit=true}wcf.acp.article.delete.confirmMessage{/lang}"{if !$article->isDeleted} style="display: none"{/if}><span class="icon icon16 fa-times"></span> <span>{lang}wcf.global.button.delete{/lang}</span></a></li>
-						<li><a href="#" class="button jsButtonTrash" data-confirm-message-html="{lang __encode=true isArticleEdit=true}wcf.acp.article.trash.confirmMessage{/lang}"{if $article->isDeleted} style="display: none"{/if}><span class="icon icon16 fa-times"></span> <span>{lang}wcf.global.button.trash{/lang}</span></a></li>
+						<li><a href="#" class="button jsButtonRestore" data-confirm-message-html="{lang __encode=true isArticleEdit=true}wcf.acp.article.restore.confirmMessage{/lang}"{if !$article->isDeleted} style="display: none"{/if}>{icon size=16 name='arrows-rotate' type='solid'} <span>{lang}wcf.global.button.restore{/lang}</span></a></li>
+						<li><a href="#" class="button jsButtonDelete" data-confirm-message-html="{lang __encode=true isArticleEdit=true}wcf.acp.article.delete.confirmMessage{/lang}"{if !$article->isDeleted} style="display: none"{/if}>{icon size=16 name='times' type='solid'} <span>{lang}wcf.global.button.delete{/lang}</span></a></li>
+						<li><a href="#" class="button jsButtonTrash" data-confirm-message-html="{lang __encode=true isArticleEdit=true}wcf.acp.article.trash.confirmMessage{/lang}"{if $article->isDeleted} style="display: none"{/if}>{icon size=16 name='times' type='solid'} <span>{lang}wcf.global.button.trash{/lang}</span></a></li>
 					{/if}
 					{if $languages|count > 1 || $article->isMultilingual}
-						<li><a href="#" class="button jsButtonToggleI18n"><span class="icon icon16 fa-flag"></span> <span>{lang}wcf.acp.article.button.toggleI18n{/lang}</span></a></li>
+						<li><a href="#" class="button jsButtonToggleI18n">{icon size=16 name='flag' type='solid'} <span>{lang}wcf.acp.article.button.toggleI18n{/lang}</span></a></li>
 					{/if}
-					<li><a href="{$article->getLink()}" class="button"><span class="icon icon16 fa-search"></span> <span>{lang}wcf.acp.article.button.viewArticle{/lang}</span></a></li>
+					<li><a href="{$article->getLink()}" class="button">{icon size=16 name='search' type='solid'} <span>{lang}wcf.acp.article.button.viewArticle{/lang}</span></a></li>
 				{/if}
-				<li><a href="{link controller='ArticleList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.article.list{/lang}</span></a></li>
+				<li><a href="{link controller='ArticleList'}{/link}" class="button">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.menu.link.article.list{/lang}</span></a></li>
 				
 				{event name='contentHeaderNavigation'}
 			</ul>
diff --git a/wcfsetup/install/files/acp/templates/articleList.tpl b/wcfsetup/install/files/acp/templates/articleList.tpl
index 42cb4667d2..b7b71ff128 100644
--- a/wcfsetup/install/files/acp/templates/articleList.tpl
+++ b/wcfsetup/install/files/acp/templates/articleList.tpl
@@ -27,9 +27,9 @@
 	<nav class="contentHeaderNavigation">
 		<ul>
 			{if $availableLanguages|count > 1}
-				<li><a href="#" class="button jsButtonArticleAdd"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.article.add{/lang}</span></a></li>
+				<li><a href="#" class="button jsButtonArticleAdd">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.article.add{/lang}</span></a></li>
 			{else}
-				<li><a href="{link controller='ArticleAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.article.add{/lang}</span></a></li>
+				<li><a href="{link controller='ArticleAdd'}{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.article.add{/lang}</span></a></li>
 			{/if}
 			
 			{event name='contentHeaderNavigation'}
@@ -142,16 +142,16 @@
 					<tr class="jsArticleRow jsClipboardObject" data-object-id="{@$article->articleID}">
 						<td class="columnMark"><input type="checkbox" class="jsClipboardItem" data-object-id="{@$article->articleID}"></td>
 						<td class="columnIcon">
-							<a href="{link controller='ArticleEdit' id=$article->articleID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 fa-pencil"></span></a>
+							<a href="{link controller='ArticleEdit' id=$article->articleID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil' type='solid'}</a>
 							{if $article->canDelete()}
-								<a href="#" class="jsButtonRestore jsTooltip" title="{lang}wcf.global.button.restore{/lang}" data-confirm-message-html="{lang __encode=true}wcf.acp.article.restore.confirmMessage{/lang}"{if !$article->isDeleted} style="display: none"{/if}><span class="icon icon16 fa-refresh"></span></a>
-								<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}><span class="icon icon16 fa-times"></span></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}><span class="icon icon16 fa-times"></span></a>
+								<a href="#" class="jsButtonRestore jsTooltip" title="{lang}wcf.global.button.restore{/lang}" data-confirm-message-html="{lang __encode=true}wcf.acp.article.restore.confirmMessage{/lang}"{if !$article->isDeleted} style="display: none"{/if}>{icon size=16 name='arrows-rotate' type='solid'}</a>
+								<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='times' type='solid'}</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='times' type='solid'}</a>
 							{else}
 								<span class="icon icon16 fa-times disabled" title="{lang}wcf.global.button.delete{/lang}"></span>
 							{/if}
 							
-							<a href="{$article->getLink()}" title="{lang}wcf.acp.article.button.viewArticle{/lang}" class="jsTooltip"><span class="icon icon16 fa-search"></span></a>
+							<a href="{$article->getLink()}" title="{lang}wcf.acp.article.button.viewArticle{/lang}" class="jsTooltip">{icon size=16 name='search' type='solid'}</a>
 							
 							{event name='rowButtons'}
 						</td>
@@ -220,9 +220,9 @@
 		<nav class="contentFooterNavigation">
 			<ul>
 				{if $availableLanguages|count > 1}
-					<li><a href="#" class="button jsButtonArticleAdd"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.article.add{/lang}</span></a></li>
+					<li><a href="#" class="button jsButtonArticleAdd">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.article.add{/lang}</span></a></li>
 				{else}
-					<li><a href="{link controller='ArticleAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.article.add{/lang}</span></a></li>
+					<li><a href="{link controller='ArticleAdd'}{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.article.add{/lang}</span></a></li>
 				{/if}
 				
 				{event name='contentFooterNavigation'}
diff --git a/wcfsetup/install/files/acp/templates/bbcodeAdd.tpl b/wcfsetup/install/files/acp/templates/bbcodeAdd.tpl
index 787a47127f..9a998e25f4 100644
--- a/wcfsetup/install/files/acp/templates/bbcodeAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/bbcodeAdd.tpl
@@ -77,7 +77,7 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='BBCodeList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.bbcode.list{/lang}</span></a></li>
+			<li><a href="{link controller='BBCodeList'}{/link}" class="button">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.menu.link.bbcode.list{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
@@ -187,7 +187,7 @@
 				<dd>
 					<div class="inputAddon">
 						<input type="text" id="wysiwygIcon" name="wysiwygIcon" value="{$wysiwygIcon}" class="medium">
-						<a href="#" class="inputSuffix button jsButtonSearchWysiwygIcon"><span class="icon icon16 fa-search"></span></a>
+						<a href="#" class="inputSuffix button jsButtonSearchWysiwygIcon">{icon size=16 name='search' type='solid'}</a>
 					</div>
 					{if $errorField == 'wysiwygIcon'}
 						<small class="innerError">
diff --git a/wcfsetup/install/files/acp/templates/bbcodeList.tpl b/wcfsetup/install/files/acp/templates/bbcodeList.tpl
index 348b3cf7be..8789822b2a 100644
--- a/wcfsetup/install/files/acp/templates/bbcodeList.tpl
+++ b/wcfsetup/install/files/acp/templates/bbcodeList.tpl
@@ -7,7 +7,7 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='BBCodeAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.bbcode.add{/lang}</span></a></li>
+			<li><a href="{link controller='BBCodeAdd'}{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.bbcode.add{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
@@ -37,7 +37,7 @@
 				{foreach from=$objects item=bbcode}
 					<tr class="jsBBCodeRow jsObjectActionObject" data-object-id="{@$bbcode->getObjectID()}">
 						<td class="columnIcon">
-							<a href="{link controller='BBCodeEdit' object=$bbcode}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 fa-pencil"></span></a>
+							<a href="{link controller='BBCodeEdit' object=$bbcode}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil' type='solid'}</a>
 							{if $bbcode->canDelete()}
 								{objectAction action="delete" objectTitle=$bbcode->getTitle()}
 							{else}
@@ -66,7 +66,7 @@
 		
 		<nav class="contentFooterNavigation">
 			<ul>
-				<li><a href="{link controller='BBCodeAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.bbcode.add{/lang}</span></a></li>
+				<li><a href="{link controller='BBCodeAdd'}{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.bbcode.add{/lang}</span></a></li>
 				
 				{event name='contentFooterNavigation'}
 			</ul>
diff --git a/wcfsetup/install/files/acp/templates/bbcodeMediaProviderAdd.tpl b/wcfsetup/install/files/acp/templates/bbcodeMediaProviderAdd.tpl
index 23b6f87772..2c0b7ff6ac 100644
--- a/wcfsetup/install/files/acp/templates/bbcodeMediaProviderAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/bbcodeMediaProviderAdd.tpl
@@ -7,7 +7,7 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='BBCodeMediaProviderList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.bbcode.mediaProvider.list{/lang}</span></a></li>
+			<li><a href="{link controller='BBCodeMediaProviderList'}{/link}" class="button">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.menu.link.bbcode.mediaProvider.list{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
diff --git a/wcfsetup/install/files/acp/templates/bbcodeMediaProviderList.tpl b/wcfsetup/install/files/acp/templates/bbcodeMediaProviderList.tpl
index 65fbd31495..ed12dee77b 100644
--- a/wcfsetup/install/files/acp/templates/bbcodeMediaProviderList.tpl
+++ b/wcfsetup/install/files/acp/templates/bbcodeMediaProviderList.tpl
@@ -7,7 +7,7 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='BBCodeMediaProviderAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.bbcode.mediaProvider.add{/lang}</span></a></li>
+			<li><a href="{link controller='BBCodeMediaProviderAdd'}{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.bbcode.mediaProvider.add{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
@@ -37,7 +37,7 @@
 					<tr class="jsMediaProviderRow jsObjectActionObject" data-object-id="{@$mediaProvider->getObjectID()}">
 						<td class="columnIcon">
 							{objectAction action="toggle" isDisabled=$mediaProvider->isDisabled}
-							<a href="{link controller='BBCodeMediaProviderEdit' object=$mediaProvider}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 fa-pencil"></span></a>
+							<a href="{link controller='BBCodeMediaProviderEdit' object=$mediaProvider}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil' type='solid'}</a>
 							{objectAction action="delete" objectTitle=$mediaProvider->getTitle()}
 							
 							{event name='rowButtons'}
@@ -61,7 +61,7 @@
 		
 		<nav class="contentFooterNavigation">
 			<ul>
-				<li><a href="{link controller='BBCodeMediaProviderAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.bbcode.mediaProvider.add{/lang}</span></a></li>
+				<li><a href="{link controller='BBCodeMediaProviderAdd'}{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.bbcode.mediaProvider.add{/lang}</span></a></li>
 				
 				{event name='contentFooterNavigation'}
 			</ul>
diff --git a/wcfsetup/install/files/acp/templates/booleanOptionType.tpl b/wcfsetup/install/files/acp/templates/booleanOptionType.tpl
index 4729f86a47..db6b9358a8 100644
--- a/wcfsetup/install/files/acp/templates/booleanOptionType.tpl
+++ b/wcfsetup/install/files/acp/templates/booleanOptionType.tpl
@@ -1,10 +1,10 @@
 <ol class="flexibleButtonGroup optionTypeBoolean">
 	<li>
 		<input type="radio" id="{$option->optionName}"{if $value == 1} checked{/if} name="values[{$option->optionName}]" value="1"{if $disableOptions || $enableOptions} class="jsEnablesOptions" data-is-boolean="true" data-disable-options="[ {@$disableOptions}]" data-enable-options="[ {@$enableOptions}]"{/if}>
-		<label for="{$option->optionName}" class="green"><span class="icon icon16 fa-check"></span> {lang}wcf.acp.option.type.boolean.yes{/lang}</label>
+		<label for="{$option->optionName}" class="green">{icon size=16 name='check' type='solid'} {lang}wcf.acp.option.type.boolean.yes{/lang}</label>
 	</li>
 	<li>
 		<input type="radio" id="{$option->optionName}_no"{if $value == 0} checked{/if} name="values[{$option->optionName}]" value="0"{if $disableOptions || $enableOptions} class="jsEnablesOptions" data-is-boolean="true" data-disable-options="[ {@$disableOptions}]" data-enable-options="[ {@$enableOptions}]"{/if}>
-		<label for="{$option->optionName}_no" class="red"><span class="icon icon16 fa-times"></span> {lang}wcf.acp.option.type.boolean.no{/lang}</label>
+		<label for="{$option->optionName}_no" class="red">{icon size=16 name='times' type='solid'} {lang}wcf.acp.option.type.boolean.no{/lang}</label>
 	</li>
 </ol>
diff --git a/wcfsetup/install/files/acp/templates/booleanSearchableOptionType.tpl b/wcfsetup/install/files/acp/templates/booleanSearchableOptionType.tpl
index d84f547a12..d66a1bfff9 100644
--- a/wcfsetup/install/files/acp/templates/booleanSearchableOptionType.tpl
+++ b/wcfsetup/install/files/acp/templates/booleanSearchableOptionType.tpl
@@ -2,11 +2,11 @@
 <ol class="flexibleButtonGroup optionTypeBoolean">
 	<li>
 		<input type="radio" id="{$option->optionName}"{if $value == 1} checked{/if} name="values[{$option->optionName}]" value="1"{if $disableOptions || $enableOptions} class="jsEnablesOptions" data-is-boolean="true" data-disable-options="[ {@$disableOptions}]" data-enable-options="[ {@$enableOptions}]"{/if}{if !$searchOption} disabled{/if}>
-		<label for="{$option->optionName}" class="green"><span class="icon icon16 fa-check"></span> {lang}wcf.acp.option.type.boolean.yes{/lang}</label>
+		<label for="{$option->optionName}" class="green">{icon size=16 name='check' type='solid'} {lang}wcf.acp.option.type.boolean.yes{/lang}</label>
 	</li>
 	<li>
 		<input type="radio" id="{$option->optionName}_no"{if $value == 0} checked{/if} name="values[{$option->optionName}]" value="0"{if $disableOptions || $enableOptions} class="jsEnablesOptions" data-is-boolean="true" data-disable-options="[ {@$disableOptions}]" data-enable-options="[ {@$enableOptions}]"{/if}{if !$searchOption} disabled{/if}>
-		<label for="{$option->optionName}_no" class="red"><span class="icon icon16 fa-times"></span> {lang}wcf.acp.option.type.boolean.no{/lang}</label>
+		<label for="{$option->optionName}_no" class="red">{icon size=16 name='times' type='solid'} {lang}wcf.acp.option.type.boolean.no{/lang}</label>
 	</li>
 </ol>
 
diff --git a/wcfsetup/install/files/acp/templates/boxAdd.tpl b/wcfsetup/install/files/acp/templates/boxAdd.tpl
index e5b39832d6..ebdde5f3f6 100644
--- a/wcfsetup/install/files/acp/templates/boxAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/boxAdd.tpl
@@ -75,9 +75,9 @@
 	<nav class="contentHeaderNavigation">
 		<ul>
 			{if $action === 'edit'}
-				<li><a href="#" class="button jsButtonCopyBox"><span class="icon icon16 fa-copy"></span> {lang}wcf.acp.box.button.copyBox{/lang}</a></li>
+				<li><a href="#" class="button jsButtonCopyBox">{icon size=16 name='copy' type='solid'} {lang}wcf.acp.box.button.copyBox{/lang}</a></li>
 			{/if}
-			<li><a href="{link controller='BoxList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.cms.box.list{/lang}</span></a></li>
+			<li><a href="{link controller='BoxList'}{/link}" class="button">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.menu.link.cms.box.list{/lang}</span></a></li>
 
 			{event name='contentHeaderNavigation'}
 		</ul>
@@ -247,7 +247,7 @@
 						<dd>
 							<div class="inputAddon">
 								<input type="text" id="linkPageObjectID" name="linkPageObjectID" value="{$linkPageObjectID}" class="short">
-								<a href="#" id="searchLinkPageObjectID" class="inputSuffix button jsTooltip" title="{lang}wcf.page.pageObjectID.search{/lang}"><span class="icon icon16 fa-search"></span></a>
+								<a href="#" id="searchLinkPageObjectID" class="inputSuffix button jsTooltip" title="{lang}wcf.page.pageObjectID.search{/lang}">{icon size=16 name='search' type='solid'}</a>
 							</div>
 							{if $errorField == 'linkPageObjectID'}
 								<small class="innerError">
diff --git a/wcfsetup/install/files/acp/templates/boxList.tpl b/wcfsetup/install/files/acp/templates/boxList.tpl
index 9edcfa28ba..99d6feeac3 100644
--- a/wcfsetup/install/files/acp/templates/boxList.tpl
+++ b/wcfsetup/install/files/acp/templates/boxList.tpl
@@ -7,7 +7,7 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="#" class="button jsButtonBoxAdd"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.box.add{/lang}</span></a></li>
+			<li><a href="#" class="button jsButtonBoxAdd">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.box.add{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
@@ -118,7 +118,7 @@
 					<tr class="jsBoxRow jsObjectActionObject" data-object-id="{@$box->getObjectID()}">
 						<td class="columnIcon">
 							{objectAction action="toggle" isDisabled=$box->isDisabled}
-							<a href="{link controller='BoxEdit' id=$box->boxID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 fa-pencil"></span></a>
+							<a href="{link controller='BoxEdit' id=$box->boxID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil' type='solid'}</a>
 							{if $box->canDelete()}
 								{objectAction action="delete" objectTitle=$box->name}
 							{else}
@@ -149,7 +149,7 @@
 		
 		<nav class="contentFooterNavigation">
 			<ul>
-				<li><a href="#" class="button jsButtonBoxAdd"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.box.add{/lang}</span></a></li>
+				<li><a href="#" class="button jsButtonBoxAdd">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.box.add{/lang}</span></a></li>
 				
 				{event name='contentFooterNavigation'}
 			</ul>
diff --git a/wcfsetup/install/files/acp/templates/cacheList.tpl b/wcfsetup/install/files/acp/templates/cacheList.tpl
index 9e2de2905a..e160054034 100644
--- a/wcfsetup/install/files/acp/templates/cacheList.tpl
+++ b/wcfsetup/install/files/acp/templates/cacheList.tpl
@@ -16,7 +16,7 @@
 			<ul>
 				{content}
 					{if $cacheData.files}
-						<li><a onclick="WCF.System.Confirmation.show('{jslang}wcf.acp.cache.clear.sure{/jslang}', $.proxy(function (action) { if (action == 'confirm') window.location.href = $(this).attr('href'); }, this)); return false;" href="{link controller='CacheClear'}{/link}" class="button"><span class="icon icon16 fa-times"></span> <span>{lang}wcf.acp.cache.button.clear{/lang}</span></a></li>
+						<li><a onclick="WCF.System.Confirmation.show('{jslang}wcf.acp.cache.clear.sure{/jslang}', $.proxy(function (action) { if (action == 'confirm') window.location.href = $(this).attr('href'); }, this)); return false;" href="{link controller='CacheClear'}{/link}" class="button">{icon size=16 name='times' type='solid'} <span>{lang}wcf.acp.cache.button.clear{/lang}</span></a></li>
 					{/if}
 					
 					{event name='contentHeaderNavigation'}
@@ -63,7 +63,7 @@
 			<section class="section tabularBox tabularBoxTitle">
 				<header>
 					<h2>
-						<a class="jsCollapsible jsTooltip" data-is-open="0" data-collapsible-container="cache{@$cacheIndex}" title="{lang}wcf.global.button.collapsible{/lang}"><span class="icon icon16 fa-chevron-right"></span></a>
+						<a class="jsCollapsible jsTooltip" data-is-open="0" data-collapsible-container="cache{@$cacheIndex}" title="{lang}wcf.global.button.collapsible{/lang}">{icon size=16 name='chevron-right' type='solid'}</a>
 						{lang}wcf.acp.cache.type.{$cacheType}{/lang}
 						<span class="badge">{#$files|count}</span>
 					</h2>
@@ -106,7 +106,7 @@
 			<ul>
 				{content}
 					{if $cacheData.files}
-						<li><a onclick="WCF.System.Confirmation.show('{jslang}wcf.acp.cache.clear.sure{/jslang}', $.proxy(function (action) { if (action == 'confirm') window.location.href = $(this).attr('href'); }, this)); return false;" href="{link controller='CacheClear'}{/link}" class="button"><span class="icon icon16 fa-times"></span> <span>{lang}wcf.acp.cache.button.clear{/lang}</span></a></li>
+						<li><a onclick="WCF.System.Confirmation.show('{jslang}wcf.acp.cache.clear.sure{/jslang}', $.proxy(function (action) { if (action == 'confirm') window.location.href = $(this).attr('href'); }, this)); return false;" href="{link controller='CacheClear'}{/link}" class="button">{icon size=16 name='times' type='solid'} <span>{lang}wcf.acp.cache.button.clear{/lang}</span></a></li>
 					{/if}
 					
 					{event name='contentFooterNavigation'}
diff --git a/wcfsetup/install/files/acp/templates/captchaQuestionAdd.tpl b/wcfsetup/install/files/acp/templates/captchaQuestionAdd.tpl
index 894c5b41de..25fd70dc1c 100644
--- a/wcfsetup/install/files/acp/templates/captchaQuestionAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/captchaQuestionAdd.tpl
@@ -7,7 +7,7 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='CaptchaQuestionList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.captcha.question.list{/lang}</span></a></li>
+			<li><a href="{link controller='CaptchaQuestionList'}{/link}" class="button">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.menu.link.captcha.question.list{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
diff --git a/wcfsetup/install/files/acp/templates/captchaQuestionList.tpl b/wcfsetup/install/files/acp/templates/captchaQuestionList.tpl
index 31b83cd4a1..00010ab4a4 100644
--- a/wcfsetup/install/files/acp/templates/captchaQuestionList.tpl
+++ b/wcfsetup/install/files/acp/templates/captchaQuestionList.tpl
@@ -7,7 +7,7 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='CaptchaQuestionAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.captcha.question.add{/lang}</span></a></li>
+			<li><a href="{link controller='CaptchaQuestionAdd'}{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.captcha.question.add{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
@@ -37,7 +37,7 @@
 					<tr class="jsQuestionRow jsObjectActionObject" data-object-id="{@$question->getObjectID()}">
 						<td class="columnIcon">
 							{objectAction action="toggle" isDisabled=$question->isDisabled}
-							<a href="{link controller='CaptchaQuestionEdit' id=$question->questionID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 fa-pencil"></span></a>
+							<a href="{link controller='CaptchaQuestionEdit' id=$question->questionID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil' type='solid'}</a>
 							{objectAction action="delete" objectTitle=$question->getQuestion()}
 							
 							{event name='rowButtons'}
@@ -61,7 +61,7 @@
 		
 		<nav class="contentFooterNavigation">
 			<ul>
-				<li><a href="{link controller='CaptchaQuestionAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.captcha.question.add{/lang}</span></a></li>
+				<li><a href="{link controller='CaptchaQuestionAdd'}{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.captcha.question.add{/lang}</span></a></li>
 				
 				{event name='contentFooterNavigation'}
 			</ul>
diff --git a/wcfsetup/install/files/acp/templates/categoryAdd.tpl b/wcfsetup/install/files/acp/templates/categoryAdd.tpl
index 74ac5fd8c7..35dd29234d 100644
--- a/wcfsetup/install/files/acp/templates/categoryAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/categoryAdd.tpl
@@ -26,7 +26,7 @@
 				{content}
 					{if $action == 'edit' && $availableCategories->hasChildren()}
 						<li class="dropdown">
-							<a class="button dropdownToggle"><span class="icon icon16 fa-sort"></span> <span>{@$objectType->getProcessor()->getLanguageVariable('button.choose')}</span></a>
+							<a class="button dropdownToggle">{icon size=16 name='sort' type='solid'} <span>{@$objectType->getProcessor()->getLanguageVariable('button.choose')}</span></a>
 							<div class="dropdownMenu">
 								<ul class="scrollableDropdownMenu">
 									{foreach from=$availableCategories item='availableCategory'}
@@ -38,7 +38,7 @@
 					{/if}
 					
 					{if $objectType->getProcessor()->canDeleteCategory() || $objectType->getProcessor()->canEditCategory()}
-						<li><a href="{link controller=$listController application=$objectType->getProcessor()->getApplication()}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{@$objectType->getProcessor()->getLanguageVariable('button.list')}</span></a></li>
+						<li><a href="{link controller=$listController application=$objectType->getProcessor()->getApplication()}{/link}" class="button">{icon size=16 name='list' type='solid'} <span>{@$objectType->getProcessor()->getLanguageVariable('button.list')}</span></a></li>
 					{/if}
 					
 					{event name='contentHeaderNavigation'}
diff --git a/wcfsetup/install/files/acp/templates/categoryList.tpl b/wcfsetup/install/files/acp/templates/categoryList.tpl
index ad8da0d806..eb6553f451 100644
--- a/wcfsetup/install/files/acp/templates/categoryList.tpl
+++ b/wcfsetup/install/files/acp/templates/categoryList.tpl
@@ -77,7 +77,7 @@
 			<ul>
 				{content}
 					{if $objectType->getProcessor()->canAddCategory()}
-						<li><a href="{link controller=$addController application=$objectType->getProcessor()->getApplication()}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{@$objectType->getProcessor()->getLanguageVariable('add')}</span></a></li>
+						<li><a href="{link controller=$addController application=$objectType->getProcessor()->getApplication()}{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{@$objectType->getProcessor()->getLanguageVariable('add')}</span></a></li>
 					{/if}
 						
 					{event name='contentHeaderNavigation'}
@@ -112,7 +112,7 @@
 								
 								{if $objectType->getProcessor()->canEditCategory()}
 									{objectAction action="toggle" isDisabled=$category->isDisabled}
-									<a href="{link controller=$editController application=$objectType->getProcessor()->getApplication() id=$category->categoryID title=$category->getTitle()}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 fa-pencil"></span></a>
+									<a href="{link controller=$editController application=$objectType->getProcessor()->getApplication() id=$category->categoryID title=$category->getTitle()}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil' type='solid'}</a>
 								{/if}
 								
 								{if $objectType->getProcessor()->canDeleteCategory()}
diff --git a/wcfsetup/install/files/acp/templates/contactOptionAdd.tpl b/wcfsetup/install/files/acp/templates/contactOptionAdd.tpl
index ca561d87c0..d12d75b7bd 100644
--- a/wcfsetup/install/files/acp/templates/contactOptionAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/contactOptionAdd.tpl
@@ -7,7 +7,7 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='ContactSettings'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.contact.settings{/lang}</span></a></li>
+			<li><a href="{link controller='ContactSettings'}{/link}" class="button">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.menu.link.contact.settings{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
diff --git a/wcfsetup/install/files/acp/templates/contactRecipientAdd.tpl b/wcfsetup/install/files/acp/templates/contactRecipientAdd.tpl
index b0489d2681..86a96c0c6e 100644
--- a/wcfsetup/install/files/acp/templates/contactRecipientAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/contactRecipientAdd.tpl
@@ -7,7 +7,7 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='ContactSettings'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.contact.settings{/lang}</span></a></li>
+			<li><a href="{link controller='ContactSettings'}{/link}" class="button">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.menu.link.contact.settings{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
diff --git a/wcfsetup/install/files/acp/templates/contactSettings.tpl b/wcfsetup/install/files/acp/templates/contactSettings.tpl
index 297dd6a093..f424184a8e 100644
--- a/wcfsetup/install/files/acp/templates/contactSettings.tpl
+++ b/wcfsetup/install/files/acp/templates/contactSettings.tpl
@@ -22,8 +22,8 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='ContactRecipientAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.contact.recipient.add{/lang}</span></a></li>
-			<li><a href="{link controller='ContactOptionAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.contact.option.add{/lang}</span></a></li>
+			<li><a href="{link controller='ContactRecipientAdd'}{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.contact.recipient.add{/lang}</span></a></li>
+			<li><a href="{link controller='ContactOptionAdd'}{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.contact.option.add{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
@@ -51,7 +51,7 @@
 					<tr class="sortableNode jsOptionRow jsObjectActionObject" data-object-id="{@$option->optionID}">
 						<td class="columnIcon">
 							{objectAction action="toggle" isDisabled=$option->isDisabled}
-							<a href="{link controller='ContactOptionEdit' id=$option->optionID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 fa-pencil"></span></a>
+							<a href="{link controller='ContactOptionEdit' id=$option->optionID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil' type='solid'}</a>
 							{if $option->canDelete()}
 								{objectAction action="delete" objectTitle=$option->getTitle()}
 							{else}
diff --git a/wcfsetup/install/files/acp/templates/cronjobAdd.tpl b/wcfsetup/install/files/acp/templates/cronjobAdd.tpl
index bce6da0ab8..c3fa049fdd 100644
--- a/wcfsetup/install/files/acp/templates/cronjobAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/cronjobAdd.tpl
@@ -7,7 +7,7 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='CronjobList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.cronjob.list{/lang}</span></a></li>
+			<li><a href="{link controller='CronjobList'}{/link}" class="button">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.menu.link.cronjob.list{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
diff --git a/wcfsetup/install/files/acp/templates/cronjobList.tpl b/wcfsetup/install/files/acp/templates/cronjobList.tpl
index fc102d7fbd..ce58a82740 100644
--- a/wcfsetup/install/files/acp/templates/cronjobList.tpl
+++ b/wcfsetup/install/files/acp/templates/cronjobList.tpl
@@ -14,7 +14,7 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='CronjobAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.cronjob.add{/lang}</span></a></li>
+			<li><a href="{link controller='CronjobAdd'}{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.cronjob.add{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
@@ -63,7 +63,7 @@
 								{/if}
 								
 								{if $cronjob->isEditable()}
-									<a href="{link controller='CronjobEdit' id=$cronjob->cronjobID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 fa-pencil"></span></a>
+									<a href="{link controller='CronjobEdit' id=$cronjob->cronjobID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil' type='solid'}</a>
 								{else}
 									<span class="icon icon16 fa-pencil disabled" title="{lang}wcf.global.button.edit{/lang}"></span>
 								{/if}
@@ -114,7 +114,7 @@
 	
 	<nav class="contentFooterNavigation">
 		<ul>
-			<li><a href="{link controller='CronjobAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.cronjob.add{/lang}</span></a></li>
+			<li><a href="{link controller='CronjobAdd'}{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.cronjob.add{/lang}</span></a></li>
 			
 			{event name='contentFooterNavigation'}
 		</ul>
diff --git a/wcfsetup/install/files/acp/templates/cronjobLogList.tpl b/wcfsetup/install/files/acp/templates/cronjobLogList.tpl
index ee6e9c1e67..f22b9a27f5 100644
--- a/wcfsetup/install/files/acp/templates/cronjobLogList.tpl
+++ b/wcfsetup/install/files/acp/templates/cronjobLogList.tpl
@@ -21,7 +21,7 @@
 			<ul>
 				{content}
 					{if $objects|count}
-						<li><a title="{lang}wcf.acp.cronjob.log.clear{/lang}" class="button jsCronjobLogDelete"><span class="icon icon16 fa-times"></span> <span>{lang}wcf.acp.cronjob.log.clear{/lang}</span></a></li>
+						<li><a title="{lang}wcf.acp.cronjob.log.clear{/lang}" class="button jsCronjobLogDelete">{icon size=16 name='times' type='solid'} <span>{lang}wcf.acp.cronjob.log.clear{/lang}</span></a></li>
 					{/if}
 					
 					{event name='contentHeaderNavigation'}
@@ -130,7 +130,7 @@
 				<ul>
 					{content}
 						{if $objects|count}
-							<li><a title="{lang}wcf.acp.cronjob.log.clear{/lang}" class="button jsCronjobLogDelete"><span class="icon icon16 fa-times"></span> <span>{lang}wcf.acp.cronjob.log.clear{/lang}</span></a></li>
+							<li><a title="{lang}wcf.acp.cronjob.log.clear{/lang}" class="button jsCronjobLogDelete">{icon size=16 name='times' type='solid'} <span>{lang}wcf.acp.cronjob.log.clear{/lang}</span></a></li>
 						{/if}
 						
 						{event name='contentFooterNavigation'}
diff --git a/wcfsetup/install/files/acp/templates/devtoolsMissingLanguageItemList.tpl b/wcfsetup/install/files/acp/templates/devtoolsMissingLanguageItemList.tpl
index 70c75c0efd..cac5f22838 100644
--- a/wcfsetup/install/files/acp/templates/devtoolsMissingLanguageItemList.tpl
+++ b/wcfsetup/install/files/acp/templates/devtoolsMissingLanguageItemList.tpl
@@ -10,8 +10,8 @@
 			<ul>
 				{content}
 					{if $items}
-						<li><a href="#" id="clearExisingMissingLanguageItemLog" class="button"><span class="icon icon16 fa-times"></span> <span>{lang}wcf.acp.devtools.missingLanguageItem.clearExistingLog{/lang}</span></a></li>
-						<li><a href="#" id="clearMissingLanguageItemLog" class="button"><span class="icon icon16 fa-times"></span> <span>{lang}wcf.acp.devtools.missingLanguageItem.clearLog{/lang}</span></a></li>
+						<li><a href="#" id="clearExisingMissingLanguageItemLog" class="button">{icon size=16 name='times' type='solid'} <span>{lang}wcf.acp.devtools.missingLanguageItem.clearExistingLog{/lang}</span></a></li>
+						<li><a href="#" id="clearMissingLanguageItemLog" class="button">{icon size=16 name='times' type='solid'} <span>{lang}wcf.acp.devtools.missingLanguageItem.clearLog{/lang}</span></a></li>
 					{/if}
 					
 					{event name='contentHeaderNavigation'}
diff --git a/wcfsetup/install/files/acp/templates/devtoolsProjectAdd.tpl b/wcfsetup/install/files/acp/templates/devtoolsProjectAdd.tpl
index 70a6f902d1..80d5a0b7e0 100644
--- a/wcfsetup/install/files/acp/templates/devtoolsProjectAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/devtoolsProjectAdd.tpl
@@ -8,10 +8,10 @@
 	<nav class="contentHeaderNavigation">
 		<ul>
 			{if $action === 'edit'}
-				<li><a href="{link controller='DevtoolsProjectSync' id=$formObject->getObjectID()}{/link}" class="button"><span class="icon icon16 fa-refresh"></span> <span>{lang}wcf.acp.devtools.project.sync{/lang}</span></a></li>
-				<li><a href="{link controller='DevtoolsProjectPipList' id=$formObject->getObjectID()}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.devtools.project.pips{/lang}</span></a></li>
+				<li><a href="{link controller='DevtoolsProjectSync' id=$formObject->getObjectID()}{/link}" class="button">{icon size=16 name='arrows-rotate' type='solid'} <span>{lang}wcf.acp.devtools.project.sync{/lang}</span></a></li>
+				<li><a href="{link controller='DevtoolsProjectPipList' id=$formObject->getObjectID()}{/link}" class="button">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.devtools.project.pips{/lang}</span></a></li>
 			{/if}
-			<li><a href="{link controller='DevtoolsProjectList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.devtools.project.list{/lang}</span></a></li>
+			<li><a href="{link controller='DevtoolsProjectList'}{/link}" class="button">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.menu.link.devtools.project.list{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
diff --git a/wcfsetup/install/files/acp/templates/devtoolsProjectList.tpl b/wcfsetup/install/files/acp/templates/devtoolsProjectList.tpl
index e492bbbfed..2df1917cee 100644
--- a/wcfsetup/install/files/acp/templates/devtoolsProjectList.tpl
+++ b/wcfsetup/install/files/acp/templates/devtoolsProjectList.tpl
@@ -15,8 +15,8 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="#" class="button jsDevtoolsProjectQuickSetupButton"><span class="icon icon16 fa-search"></span> <span>{lang}wcf.acp.devtools.project.quickSetup{/lang}</span></a></li>
-			<li><a href="{link controller='DevtoolsProjectAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.devtools.project.add{/lang}</span></a></li>
+			<li><a href="#" class="button jsDevtoolsProjectQuickSetupButton">{icon size=16 name='search' type='solid'} <span>{lang}wcf.acp.devtools.project.quickSetup{/lang}</span></a></li>
+			<li><a href="{link controller='DevtoolsProjectAdd'}{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.devtools.project.add{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
@@ -47,7 +47,7 @@
 								<a href="{link controller='DevtoolsProjectPipList' id=$object->getObjectID()}{/link}" class="button small">{lang}wcf.acp.devtools.project.pips{/lang}</a>
 							</td>
 							<td class="columnIcon">
-								<a href="{link controller='DevtoolsProjectEdit' id=$object->getObjectID()}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 fa-pencil"></span></a>
+								<a href="{link controller='DevtoolsProjectEdit' id=$object->getObjectID()}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil' type='solid'}</a>
 								{objectAction action="delete" objectTitle=$object->name}
 							</td>
 							<td class="columnID">{@$object->getObjectID()}</td>
@@ -66,7 +66,7 @@
 <footer class="contentFooter">
 	<nav class="contentFooterNavigation">
 		<ul>
-			<li><a href="{link controller='DevtoolsProjectAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.devtools.project.add{/lang}</span></a></li>
+			<li><a href="{link controller='DevtoolsProjectAdd'}{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.devtools.project.add{/lang}</span></a></li>
 			
 			{event name='contentFooterNavigation'}
 		</ul>
diff --git a/wcfsetup/install/files/acp/templates/devtoolsProjectPipEntryAdd.tpl b/wcfsetup/install/files/acp/templates/devtoolsProjectPipEntryAdd.tpl
index b1d48da4fe..24c695af23 100644
--- a/wcfsetup/install/files/acp/templates/devtoolsProjectPipEntryAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/devtoolsProjectPipEntryAdd.tpl
@@ -8,8 +8,8 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='DevtoolsProjectPipEntryList' id=$project->projectID pip=$pip entryType=$entryType}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.devtools.project.pip.entry.list{/lang}</span></a></li>
-			<li><a href="{link controller='DevtoolsProjectList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.devtools.project.list{/lang}</span></a></li>
+			<li><a href="{link controller='DevtoolsProjectPipEntryList' id=$project->projectID pip=$pip entryType=$entryType}{/link}" class="button">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.devtools.project.pip.entry.list{/lang}</span></a></li>
+			<li><a href="{link controller='DevtoolsProjectList'}{/link}" class="button">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.menu.link.devtools.project.list{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
diff --git a/wcfsetup/install/files/acp/templates/devtoolsProjectPipEntryList.tpl b/wcfsetup/install/files/acp/templates/devtoolsProjectPipEntryList.tpl
index 5ebdf0e9b6..59b85cd2be 100644
--- a/wcfsetup/install/files/acp/templates/devtoolsProjectPipEntryList.tpl
+++ b/wcfsetup/install/files/acp/templates/devtoolsProjectPipEntryList.tpl
@@ -9,7 +9,7 @@
 	<nav class="contentHeaderNavigation">
 		<ul>
 			<li class="dropdown">
-				<a class="button dropdownToggle"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.devtools.project.pip.list{/lang}</span></a>
+				<a class="button dropdownToggle">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.devtools.project.pip.list{/lang}</span></a>
 				<div class="dropdownMenu">
 					<ul class="scrollableDropdownMenu">
 						{foreach from=$project->getPips() item=otherPip}
@@ -24,8 +24,8 @@
 					</ul>
 				</div>
 			</li>
-			<li><a href="{link controller='DevtoolsProjectPipEntryAdd' id=$project->projectID pip=$pip entryType=$entryType}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.devtools.project.pip.entry.button.add{/lang}</span></a></li>
-			<li><a href="{link controller='DevtoolsProjectList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.devtools.project.list{/lang}</span></a></li>
+			<li><a href="{link controller='DevtoolsProjectPipEntryAdd' id=$project->projectID pip=$pip entryType=$entryType}{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.devtools.project.pip.entry.button.add{/lang}</span></a></li>
+			<li><a href="{link controller='DevtoolsProjectList'}{/link}" class="button">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.menu.link.devtools.project.list{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
@@ -77,7 +77,7 @@
 				{foreach from=$entryList->getEntries($startIndex-1, $itemsPerPage) key=identifier item=entry}
 					<tr class="jsPipEntryRow" data-identifier="{@$identifier}">
 						<td class="columnIcon">
-							<a href="{link controller='DevtoolsProjectPipEntryEdit' id=$project->projectID pip=$pip identifier=$identifier entryType=$entryType}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 fa-pencil"></span></a>
+							<a href="{link controller='DevtoolsProjectPipEntryEdit' id=$project->projectID pip=$pip identifier=$identifier entryType=$entryType}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil' type='solid'}</a>
 							<span class="icon icon16 fa-times jsDeleteButton jsTooltip pointer" title="{lang}wcf.global.button.delete{/lang}"></span>
 						</td>
 						{foreach from=$entryList->getKeys() key=key item=languageItem}
@@ -99,7 +99,7 @@
 		<nav class="contentFooterNavigation">
 			<ul>
 				<li class="dropdown">
-					<a class="button dropdownToggle"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.devtools.project.pip.list{/lang}</span></a>
+					<a class="button dropdownToggle">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.devtools.project.pip.list{/lang}</span></a>
 					<div class="dropdownMenu">
 						<ul class="scrollableDropdownMenu">
 							{foreach from=$project->getPips() item=otherPip}
@@ -114,8 +114,8 @@
 						</ul>
 					</div>
 				</li>
-				<li><a href="{link controller='DevtoolsProjectPipEntryAdd' id=$project->projectID pip=$pip entryType=$entryType}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.devtools.project.pip.entry.button.add{/lang}</span></a></li>
-				<li><a href="{link controller='DevtoolsProjectList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.devtools.project.list{/lang}</span></a></li>
+				<li><a href="{link controller='DevtoolsProjectPipEntryAdd' id=$project->projectID pip=$pip entryType=$entryType}{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.devtools.project.pip.entry.button.add{/lang}</span></a></li>
+				<li><a href="{link controller='DevtoolsProjectList'}{/link}" class="button">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.menu.link.devtools.project.list{/lang}</span></a></li>
 				
 				{event name='contentFooterNavigation'}
 			</ul>
diff --git a/wcfsetup/install/files/acp/templates/devtoolsProjectPipList.tpl b/wcfsetup/install/files/acp/templates/devtoolsProjectPipList.tpl
index 8514b302e1..faa2b6e05a 100644
--- a/wcfsetup/install/files/acp/templates/devtoolsProjectPipList.tpl
+++ b/wcfsetup/install/files/acp/templates/devtoolsProjectPipList.tpl
@@ -9,10 +9,10 @@
 	<nav class="contentHeaderNavigation">
 		<ul>
 			{if $project->validate() === ''}
-				<li><a href="{link controller='DevtoolsProjectSync' id=$project->getObjectID()}{/link}" class="button"><span class="icon icon16 fa-refresh"></span> <span>{lang}wcf.acp.devtools.project.sync{/lang}</span></a></li>
+				<li><a href="{link controller='DevtoolsProjectSync' id=$project->getObjectID()}{/link}" class="button">{icon size=16 name='arrows-rotate' type='solid'} <span>{lang}wcf.acp.devtools.project.sync{/lang}</span></a></li>
 			{/if}
-			<li><a href="{link controller='DevtoolsProjectEdit' id=$project->getObjectID()}{/link}" class="button"><span class="icon icon16 fa-pencil"></span> <span>{lang}wcf.acp.devtools.project.edit{/lang}</span></a></li>
-			<li><a href="{link controller='DevtoolsProjectList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.devtools.project.list{/lang}</span></a></li>
+			<li><a href="{link controller='DevtoolsProjectEdit' id=$project->getObjectID()}{/link}" class="button">{icon size=16 name='pencil' type='solid'} <span>{lang}wcf.acp.devtools.project.edit{/lang}</span></a></li>
+			<li><a href="{link controller='DevtoolsProjectList'}{/link}" class="button">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.menu.link.devtools.project.list{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
@@ -52,8 +52,8 @@
 						<tr data-plugin-name="{$pip->pluginName}" data-is-supported="{if $pip->supportsGui()}true{else}false{/if}" data-is-used="{if !$pip->getTargets($project)|empty}true{else}false{/if}">
 							<td class="columnIcon">
 								{if $pip->supportsGui()}
-									<a href="{link controller='DevtoolsProjectPipEntryAdd' id=$project->projectID pip=$pip->pluginName}{/link}" title="{lang}wcf.global.button.add{/lang}" class="jsTooltip"><span class="icon icon16 fa-plus"></span></a>
-									<a href="{link controller='DevtoolsProjectPipEntryList' id=$project->projectID pip=$pip->pluginName}{/link}" title="{lang}wcf.global.button.list{/lang}" class="jsTooltip"><span class="icon icon16 fa-list"></span></a>
+									<a href="{link controller='DevtoolsProjectPipEntryAdd' id=$project->projectID pip=$pip->pluginName}{/link}" title="{lang}wcf.global.button.add{/lang}" class="jsTooltip">{icon size=16 name='plus' type='solid'}</a>
+									<a href="{link controller='DevtoolsProjectPipEntryList' id=$project->projectID pip=$pip->pluginName}{/link}" title="{lang}wcf.global.button.list{/lang}" class="jsTooltip">{icon size=16 name='list' type='solid'}</a>
 								{else}
 									<span class="icon icon16 fa-plus disabled" title="{lang}wcf.global.button.add{/lang}"></span>
 									<span class="icon icon16 fa-list disabled" title="{lang}wcf.global.button.list{/lang}"></span>
@@ -82,8 +82,8 @@
 						{foreach from=$pip->getPip()->getEntryTypes() item=entryType}
 							<tr data-plugin-name="{$pip->pluginName}" data-is-supported="true" data-is-used="{if !$pip->getTargets($project)|empty}true{else}false{/if}">
 								<td class="columnIcon">
-									<a href="{link controller='DevtoolsProjectPipEntryAdd' id=$project->projectID pip=$pip->pluginName entryType=$entryType}{/link}" title="{lang}wcf.global.button.add{/lang}" class="jsTooltip"><span class="icon icon16 fa-plus"></span></a>
-									<a href="{link controller='DevtoolsProjectPipEntryList' id=$project->projectID pip=$pip->pluginName entryType=$entryType}{/link}" title="{lang}wcf.global.button.list{/lang}" class="jsTooltip"><span class="icon icon16 fa-list"></span></a>
+									<a href="{link controller='DevtoolsProjectPipEntryAdd' id=$project->projectID pip=$pip->pluginName entryType=$entryType}{/link}" title="{lang}wcf.global.button.add{/lang}" class="jsTooltip">{icon size=16 name='plus' type='solid'}</a>
+									<a href="{link controller='DevtoolsProjectPipEntryList' id=$project->projectID pip=$pip->pluginName entryType=$entryType}{/link}" title="{lang}wcf.global.button.list{/lang}" class="jsTooltip">{icon size=16 name='list' type='solid'}</a>
 								</td>
 								<td class="columnText">
 									<a href="{link controller='DevtoolsProjectPipEntryList' id=$project->projectID pip=$pip->pluginName entryType=$entryType}{/link}">{$pip->pluginName} ({$entryType})</a>
diff --git a/wcfsetup/install/files/acp/templates/devtoolsProjectSync.tpl b/wcfsetup/install/files/acp/templates/devtoolsProjectSync.tpl
index cd8075003b..f591724188 100644
--- a/wcfsetup/install/files/acp/templates/devtoolsProjectSync.tpl
+++ b/wcfsetup/install/files/acp/templates/devtoolsProjectSync.tpl
@@ -9,10 +9,10 @@
 	<nav class="contentHeaderNavigation">
 		<ul>
 			{if $object->validate() === ''}
-				<li><a href="{link controller='DevtoolsProjectPipList' id=$object->getObjectID()}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.devtools.project.pips{/lang}</span></a></li>
+				<li><a href="{link controller='DevtoolsProjectPipList' id=$object->getObjectID()}{/link}" class="button">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.devtools.project.pips{/lang}</span></a></li>
 			{/if}
-			<li><a href="{link controller='DevtoolsProjectEdit' id=$object->getObjectID()}{/link}" class="button"><span class="icon icon16 fa-pencil"></span> <span>{lang}wcf.acp.devtools.project.edit{/lang}</span></a></li>
-			<li><a href="{link controller='DevtoolsProjectList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.devtools.project.list{/lang}</span></a></li>
+			<li><a href="{link controller='DevtoolsProjectEdit' id=$object->getObjectID()}{/link}" class="button">{icon size=16 name='pencil' type='solid'} <span>{lang}wcf.acp.devtools.project.edit{/lang}</span></a></li>
+			<li><a href="{link controller='DevtoolsProjectList'}{/link}" class="button">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.menu.link.devtools.project.list{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
diff --git a/wcfsetup/install/files/acp/templates/firstTimeSetup.tpl b/wcfsetup/install/files/acp/templates/firstTimeSetup.tpl
index a9ce379564..8adb6ee591 100644
--- a/wcfsetup/install/files/acp/templates/firstTimeSetup.tpl
+++ b/wcfsetup/install/files/acp/templates/firstTimeSetup.tpl
@@ -20,7 +20,7 @@
 		<nav class="contentHeaderNavigation">
 			<ul>
 				{content}
-					<li><a href="{link}{/link}" class="button"><span class="icon icon16 fa-home"></span> <span>{lang}wcf.global.acp{/lang}</span></a></li>
+					<li><a href="{link}{/link}" class="button">{icon size=16 name='house' type='solid'} <span>{lang}wcf.global.acp{/lang}</span></a></li>
 					
 					{event name='contentHeaderNavigation'}
 				{/content}
diff --git a/wcfsetup/install/files/acp/templates/labelAdd.tpl b/wcfsetup/install/files/acp/templates/labelAdd.tpl
index 00bb0a609c..c7d85d608d 100644
--- a/wcfsetup/install/files/acp/templates/labelAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/labelAdd.tpl
@@ -31,7 +31,7 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='LabelList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.label.list{/lang}</span></a></li>
+			<li><a href="{link controller='LabelList'}{/link}" class="button">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.menu.link.label.list{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
diff --git a/wcfsetup/install/files/acp/templates/labelGroupAdd.tpl b/wcfsetup/install/files/acp/templates/labelGroupAdd.tpl
index fa4671cbdc..adc3927f23 100644
--- a/wcfsetup/install/files/acp/templates/labelGroupAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/labelGroupAdd.tpl
@@ -24,9 +24,9 @@
 	<nav class="contentHeaderNavigation">
 		<ul>
 			{if $action == 'edit'}
-				<li><a href="{link controller='LabelList' id=$groupID}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.label.list{/lang}</span></a></li>
+				<li><a href="{link controller='LabelList' id=$groupID}{/link}" class="button">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.label.list{/lang}</span></a></li>
 			{/if}
-			<li><a href="{link controller='LabelGroupList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.label.group.list{/lang}</span></a></li>
+			<li><a href="{link controller='LabelGroupList'}{/link}" class="button">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.label.group.list{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
diff --git a/wcfsetup/install/files/acp/templates/labelGroupList.tpl b/wcfsetup/install/files/acp/templates/labelGroupList.tpl
index 9eefef0a61..ae9d86711c 100644
--- a/wcfsetup/install/files/acp/templates/labelGroupList.tpl
+++ b/wcfsetup/install/files/acp/templates/labelGroupList.tpl
@@ -7,7 +7,7 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='LabelGroupAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.label.group.add{/lang}</span></a></li>
+			<li><a href="{link controller='LabelGroupAdd'}{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.label.group.add{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
@@ -78,7 +78,7 @@
 				{foreach from=$objects item=group}
 					<tr class="jsLabelGroupRow jsObjectActionObject" data-object-id="{@$group->getObjectID()}">
 						<td class="columnIcon">
-							<a href="{link controller='LabelGroupEdit' object=$group}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 fa-pencil"></span></a>
+							<a href="{link controller='LabelGroupEdit' object=$group}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil' type='solid'}</a>
 							{objectAction action="delete" objectTitle=$group->getTitle()}
 							
 							{event name='rowButtons'}
@@ -105,7 +105,7 @@
 		
 		<nav class="contentFooterNavigation">
 			<ul>
-				<li><a href="{link controller='LabelGroupAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.label.group.add{/lang}</span></a></li>
+				<li><a href="{link controller='LabelGroupAdd'}{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.label.group.add{/lang}</span></a></li>
 				
 				{event name='contentFooterNavigation'}
 			</ul>
diff --git a/wcfsetup/install/files/acp/templates/labelList.tpl b/wcfsetup/install/files/acp/templates/labelList.tpl
index 793c3bab30..602f17c96d 100644
--- a/wcfsetup/install/files/acp/templates/labelList.tpl
+++ b/wcfsetup/install/files/acp/templates/labelList.tpl
@@ -20,7 +20,7 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='LabelAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.label.add{/lang}</span></a></li>
+			<li><a href="{link controller='LabelAdd'}{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.label.add{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
@@ -108,7 +108,7 @@
 				{foreach from=$objects item=label}
 					<tr class="jsLabelRow jsObjectActionObject{if $labelGroup && !$labelSearch && !$cssClassName && $items > 1} sortableNode{/if}" data-object-id="{@$label->getObjectID()}">
 						<td class="columnIcon">
-							<a href="{link controller='LabelEdit' object=$label}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 fa-pencil"></span></a>
+							<a href="{link controller='LabelEdit' object=$label}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil' type='solid'}</a>
 							{objectAction action="delete" objectTitle=$label->getTitle()}
 							
 							{event name='rowButtons'}
@@ -142,7 +142,7 @@
 		
 		<nav class="contentFooterNavigation">
 			<ul>
-				<li><a href="{link controller='LabelAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.label.add{/lang}</span></a></li>
+				<li><a href="{link controller='LabelAdd'}{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.label.add{/lang}</span></a></li>
 				
 				{event name='contentFooterNavigation'}
 			</ul>
diff --git a/wcfsetup/install/files/acp/templates/languageAdd.tpl b/wcfsetup/install/files/acp/templates/languageAdd.tpl
index 6792f1454f..3f4bc239f2 100644
--- a/wcfsetup/install/files/acp/templates/languageAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/languageAdd.tpl
@@ -7,7 +7,7 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='LanguageList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.language.list{/lang}</span></a></li>
+			<li><a href="{link controller='LanguageList'}{/link}" class="button">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.menu.link.language.list{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
diff --git a/wcfsetup/install/files/acp/templates/languageExport.tpl b/wcfsetup/install/files/acp/templates/languageExport.tpl
index fb2d91a79f..572b8e84dd 100644
--- a/wcfsetup/install/files/acp/templates/languageExport.tpl
+++ b/wcfsetup/install/files/acp/templates/languageExport.tpl
@@ -7,7 +7,7 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='LanguageList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.language.list{/lang}</span></a></li>
+			<li><a href="{link controller='LanguageList'}{/link}" class="button">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.menu.link.language.list{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
diff --git a/wcfsetup/install/files/acp/templates/languageImport.tpl b/wcfsetup/install/files/acp/templates/languageImport.tpl
index e3def968a4..f9bde11199 100644
--- a/wcfsetup/install/files/acp/templates/languageImport.tpl
+++ b/wcfsetup/install/files/acp/templates/languageImport.tpl
@@ -7,7 +7,7 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='LanguageList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.language.list{/lang}</span></a></li>
+			<li><a href="{link controller='LanguageList'}{/link}" class="button">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.menu.link.language.list{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
diff --git a/wcfsetup/install/files/acp/templates/languageItemAdd.tpl b/wcfsetup/install/files/acp/templates/languageItemAdd.tpl
index ad39f6e9bf..2801c1fdb4 100644
--- a/wcfsetup/install/files/acp/templates/languageItemAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/languageItemAdd.tpl
@@ -7,7 +7,7 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='LanguageItemList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.language.item.list{/lang}</span></a></li>
+			<li><a href="{link controller='LanguageItemList'}{/link}" class="button">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.menu.link.language.item.list{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
diff --git a/wcfsetup/install/files/acp/templates/languageItemList.tpl b/wcfsetup/install/files/acp/templates/languageItemList.tpl
index fd4be56d4b..75d47426de 100644
--- a/wcfsetup/install/files/acp/templates/languageItemList.tpl
+++ b/wcfsetup/install/files/acp/templates/languageItemList.tpl
@@ -16,7 +16,7 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='LanguageItemAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.menu.link.language.item.add{/lang}</span></a></li>
+			<li><a href="{link controller='LanguageItemAdd'}{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.menu.link.language.item.add{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
diff --git a/wcfsetup/install/files/acp/templates/languageList.tpl b/wcfsetup/install/files/acp/templates/languageList.tpl
index ee51176b1f..bffd3a9f5b 100644
--- a/wcfsetup/install/files/acp/templates/languageList.tpl
+++ b/wcfsetup/install/files/acp/templates/languageList.tpl
@@ -7,8 +7,8 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='LanguageAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.language.add{/lang}</span></a></li>
-			<li><a href="{link controller='LanguageImport'}{/link}" class="button"><span class="icon icon16 fa-upload"></span> <span>{lang}wcf.acp.language.import{/lang}</span></a></li>
+			<li><a href="{link controller='LanguageAdd'}{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.language.add{/lang}</span></a></li>
+			<li><a href="{link controller='LanguageImport'}{/link}" class="button">{icon size=16 name='upload' type='solid'} <span>{lang}wcf.acp.language.import{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
@@ -40,7 +40,7 @@
 				{foreach from=$objects item=language}
 					<tr class="jsLanguageRow jsObjectActionObject" data-object-id="{@$language->getObjectID()}">
 						<td class="columnIcon">
-							<a href="{link controller='LanguageExport' id=$language->languageID}{/link}" title="{lang}wcf.acp.language.export{/lang}" class="jsTooltip"><span class="icon icon16 fa-download"></span></a>
+							<a href="{link controller='LanguageExport' id=$language->languageID}{/link}" title="{lang}wcf.acp.language.export{/lang}" class="jsTooltip">{icon size=16 name='download' type='solid'}</a>
 							
 							{if !$language->isDefault}
 								{objectAction action="toggle" isDisabled=$language->isDisabled}
@@ -50,7 +50,7 @@
 								<span class="icon icon16 fa-check-circle disabled" title="{lang}wcf.acp.language.setAsDefault{/lang}"></span>
 							{/if}
 							
-							<a href="{link controller='LanguageEdit' id=$language->languageID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 fa-pencil"></span></a>
+							<a href="{link controller='LanguageEdit' id=$language->languageID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil' type='solid'}</a>
 							
 							{if $language->isDeletable()}
 								{objectAction action="delete" objectTitle=$language->languageName}
@@ -82,8 +82,8 @@
 		
 		<nav class="contentFooterNavigation">
 			<ul>
-				<li><a href="{link controller='LanguageAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.language.add{/lang}</span></a></li>
-				<li><a href="{link controller='LanguageImport'}{/link}" class="button"><span class="icon icon16 fa-upload"></span> <span>{lang}wcf.acp.language.import{/lang}</span></a></li>
+				<li><a href="{link controller='LanguageAdd'}{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.language.add{/lang}</span></a></li>
+				<li><a href="{link controller='LanguageImport'}{/link}" class="button">{icon size=16 name='upload' type='solid'} <span>{lang}wcf.acp.language.import{/lang}</span></a></li>
 				
 				{event name='contentFooterNavigation'}
 			</ul>
diff --git a/wcfsetup/install/files/acp/templates/mediaEditor.tpl b/wcfsetup/install/files/acp/templates/mediaEditor.tpl
index 3a89822348..2a5114e55b 100644
--- a/wcfsetup/install/files/acp/templates/mediaEditor.tpl
+++ b/wcfsetup/install/files/acp/templates/mediaEditor.tpl
@@ -10,7 +10,7 @@
 
 <div class="box48">
 	{if $media->isImage}
-		<span class="icon icon48 fa-file-image-o"></span>
+		{icon size=48 name='file-image'}
 	{else}
 		{@$media->getElementTag(48)}
 	{/if}
diff --git a/wcfsetup/install/files/acp/templates/mediaList.tpl b/wcfsetup/install/files/acp/templates/mediaList.tpl
index 9b6572dbd8..f00eafddd5 100644
--- a/wcfsetup/install/files/acp/templates/mediaList.tpl
+++ b/wcfsetup/install/files/acp/templates/mediaList.tpl
@@ -166,7 +166,7 @@
 					<td class="columnID columnMediaID"></td>
 					<td class="columnTitle columnFilename">
 						<div class="box48">
-							<span class="icon icon48 fa-file"></span>
+							{icon size=48 name='file' type='solid'}
 							
 							<div>
 								<p></p>
diff --git a/wcfsetup/install/files/acp/templates/menuAdd.tpl b/wcfsetup/install/files/acp/templates/menuAdd.tpl
index 170da1dc8f..7b5cefb73d 100644
--- a/wcfsetup/install/files/acp/templates/menuAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/menuAdd.tpl
@@ -8,9 +8,9 @@
 	<nav class="contentHeaderNavigation">
 		<ul>
 			{if $action == 'edit'}
-				<li><a href="{link controller='MenuItemList' id=$menuID}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.item.list{/lang}</span></a></li>
+				<li><a href="{link controller='MenuItemList' id=$menuID}{/link}" class="button">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.menu.item.list{/lang}</span></a></li>
 			{/if}
-			<li><a href="{link controller='MenuList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.list{/lang}</span></a></li>
+			<li><a href="{link controller='MenuList'}{/link}" class="button">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.menu.list{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
diff --git a/wcfsetup/install/files/acp/templates/menuItemAdd.tpl b/wcfsetup/install/files/acp/templates/menuItemAdd.tpl
index d6762df5dd..8ee16c4b49 100644
--- a/wcfsetup/install/files/acp/templates/menuItemAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/menuItemAdd.tpl
@@ -43,7 +43,7 @@
 				thus we let this slip.
 				*}
 				<li class="dropdown">
-					<a class="button dropdownToggle"><span class="icon icon16 fa-sort"></span> <span>{lang}wcf.acp.menu.item.button.choose{/lang}</span></a>
+					<a class="button dropdownToggle">{icon size=16 name='sort' type='solid'} <span>{lang}wcf.acp.menu.item.button.choose{/lang}</span></a>
 					<div class="dropdownMenu">
 						<ul class="scrollableDropdownMenu">
 							{foreach from=$menuItemNodeList item='menuItemNode'}
@@ -53,7 +53,7 @@
 					</div>
 				</li>
 			{/if}
-			<li><a href="{link controller='MenuItemList' id=$menuID}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.item.list{/lang}</span></a></li>
+			<li><a href="{link controller='MenuItemList' id=$menuID}{/link}" class="button">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.menu.item.list{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
@@ -169,7 +169,7 @@
 			<dd>
 				<div class="inputAddon">
 					<input type="text" id="pageObjectID" name="pageObjectID" value="{$pageObjectID}" class="short">
-					<a href="#" id="searchPageObjectID" class="inputSuffix button jsTooltip" title="{lang}wcf.page.pageObjectID.search{/lang}"><span class="icon icon16 fa-search"></span></a>
+					<a href="#" id="searchPageObjectID" class="inputSuffix button jsTooltip" title="{lang}wcf.page.pageObjectID.search{/lang}">{icon size=16 name='search' type='solid'}</a>
 				</div>
 				{if $errorField == 'pageObjectID'}
 					<small class="innerError">
diff --git a/wcfsetup/install/files/acp/templates/menuItemList.tpl b/wcfsetup/install/files/acp/templates/menuItemList.tpl
index 4617f1c276..34c4e6fcae 100644
--- a/wcfsetup/install/files/acp/templates/menuItemList.tpl
+++ b/wcfsetup/install/files/acp/templates/menuItemList.tpl
@@ -23,8 +23,8 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='MenuEdit' id=$menuID}{/link}" class="button"><span class="icon icon16 fa-pencil"></span> <span>{lang}wcf.acp.menu.edit{/lang}</span></a></li>
-			<li><a href="{link controller='MenuItemAdd'}menuID={@$menuID}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.menu.item.add{/lang}</span></a></li>
+			<li><a href="{link controller='MenuEdit' id=$menuID}{/link}" class="button">{icon size=16 name='pencil' type='solid'} <span>{lang}wcf.acp.menu.edit{/lang}</span></a></li>
+			<li><a href="{link controller='MenuItemAdd'}menuID={@$menuID}{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.menu.item.add{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
@@ -46,7 +46,7 @@
 								{else}
 									<span class="icon icon16 fa-{if !$menuItemNode->isDisabled}check-{/if}square-o disabled" title="{lang}wcf.global.button.{if $menuItemNode->isDisabled}enable{else}disable{/if}{/lang}"></span>
 								{/if}
-								<a href="{link controller='MenuItemEdit' id=$menuItemNode->itemID}{/link}" class="jsTooltip" title="{lang}wcf.global.button.edit{/lang}"><span class="icon icon16 fa-pencil"></span></a>
+								<a href="{link controller='MenuItemEdit' id=$menuItemNode->itemID}{/link}" class="jsTooltip" title="{lang}wcf.global.button.edit{/lang}">{icon size=16 name='pencil' type='solid'}</a>
 								{if $menuItemNode->canDelete()}
 									{objectAction action="delete" objectTitle=$menuItemNode->getTitle()}
 								{else}
diff --git a/wcfsetup/install/files/acp/templates/menuList.tpl b/wcfsetup/install/files/acp/templates/menuList.tpl
index be2285fa45..902a879b24 100644
--- a/wcfsetup/install/files/acp/templates/menuList.tpl
+++ b/wcfsetup/install/files/acp/templates/menuList.tpl
@@ -7,7 +7,7 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='MenuAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.menu.add{/lang}</span></a></li>
+			<li><a href="{link controller='MenuAdd'}{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.menu.add{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
@@ -39,14 +39,14 @@
 				{foreach from=$objects item=menu}
 					<tr class="jsMenuRow jsObjectActionObject" data-object-id="{@$menu->getObjectID()}">
 						<td class="columnIcon">
-							<a href="{link controller='MenuEdit' id=$menu->menuID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 fa-pencil"></span></a>
+							<a href="{link controller='MenuEdit' id=$menu->menuID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil' type='solid'}</a>
 							{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>
 							{/if}
-							<a href="{link controller='MenuItemList' id=$menu->menuID}{/link}" title="{lang}wcf.acp.menu.item.list{/lang}" class="jsTooltip"><span class="icon icon16 fa-list"></span></a>
-							<a href="{link controller='MenuItemAdd'}menuID={@$menu->menuID}{/link}" title="{lang}wcf.acp.menu.item.add{/lang}" class="jsTooltip"><span class="icon icon16 fa-plus"></span></a>
+							<a href="{link controller='MenuItemList' id=$menu->menuID}{/link}" title="{lang}wcf.acp.menu.item.list{/lang}" class="jsTooltip">{icon size=16 name='list' type='solid'}</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' type='solid'}</a>
 							
 							{event name='rowButtons'}
 						</td>
@@ -72,7 +72,7 @@
 		
 		<nav class="contentFooterNavigation">
 			<ul>
-				<li><a href="{link controller='MenuAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.menu.add{/lang}</span></a></li>
+				<li><a href="{link controller='MenuAdd'}{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.menu.add{/lang}</span></a></li>
 				
 				{event name='contentFooterNavigation'}
 			</ul>
diff --git a/wcfsetup/install/files/acp/templates/messageFormTabs.tpl b/wcfsetup/install/files/acp/templates/messageFormTabs.tpl
index e9f7ee42b1..01d0c9c01a 100644
--- a/wcfsetup/install/files/acp/templates/messageFormTabs.tpl
+++ b/wcfsetup/install/files/acp/templates/messageFormTabs.tpl
@@ -3,7 +3,7 @@
 		<nav class="messageTabMenuNavigation jsOnly">
 			<ul>
 				{content}
-					{if MODULE_SMILEY && !$smileyCategories|empty}<li data-name="smilies"><a><span class="icon icon16 fa-smile-o"></span> <span>{lang}wcf.message.smilies{/lang}</span></a></li>{/if}
+					{if MODULE_SMILEY && !$smileyCategories|empty}<li data-name="smilies"><a>{icon size=16 name='face-smile'} <span>{lang}wcf.message.smilies{/lang}</span></a></li>{/if}
 					{event name='tabMenuTabs'}
 				{/content}
 			</ul>
diff --git a/wcfsetup/install/files/acp/templates/noticeAdd.tpl b/wcfsetup/install/files/acp/templates/noticeAdd.tpl
index 5f61f962d7..4b0f8965d1 100644
--- a/wcfsetup/install/files/acp/templates/noticeAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/noticeAdd.tpl
@@ -27,7 +27,7 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='NoticeList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.notice.list{/lang}</span></a></li>
+			<li><a href="{link controller='NoticeList'}{/link}" class="button">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.menu.link.notice.list{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
diff --git a/wcfsetup/install/files/acp/templates/noticeList.tpl b/wcfsetup/install/files/acp/templates/noticeList.tpl
index bdc6ab4b48..59a83aa7f3 100644
--- a/wcfsetup/install/files/acp/templates/noticeList.tpl
+++ b/wcfsetup/install/files/acp/templates/noticeList.tpl
@@ -17,7 +17,7 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='NoticeAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.menu.link.notice.add{/lang}</span></a></li>
+			<li><a href="{link controller='NoticeAdd'}{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.menu.link.notice.add{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
@@ -41,7 +41,7 @@
 						<span class="statusDisplay sortableButtonContainer">
 							<span class="icon icon16 fa-arrows sortableNodeHandle"></span>
 							{objectAction action="toggle" isDisabled=$notice->isDisabled}
-							<a href="{link controller='NoticeEdit' object=$notice}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 fa-pencil"></span></a>
+							<a href="{link controller='NoticeEdit' object=$notice}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil' type='solid'}</a>
 							{objectAction action="delete" objectTitle=$notice->noticeName}
 							
 							{event name='itemButtons'}
@@ -65,7 +65,7 @@
 		
 		<nav class="contentFooterNavigation">
 			<ul>
-				<li><a href="{link controller='NoticeAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.menu.link.notice.add{/lang}</span></a></li>
+				<li><a href="{link controller='NoticeAdd'}{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.menu.link.notice.add{/lang}</span></a></li>
 				
 				{event name='contentFooterNavigation'}
 			</ul>
diff --git a/wcfsetup/install/files/acp/templates/notificationPresetSettings.tpl b/wcfsetup/install/files/acp/templates/notificationPresetSettings.tpl
index c9c7d9f409..2b06fd46ea 100644
--- a/wcfsetup/install/files/acp/templates/notificationPresetSettings.tpl
+++ b/wcfsetup/install/files/acp/templates/notificationPresetSettings.tpl
@@ -73,7 +73,7 @@
 									{else}
 										<span class="icon icon24 {if $settings[$event->eventID][mailNotificationType] === 'instant'}fa-flash{else}fa-clock-o{/if} green jsIconNotificationSettingsEmailType"></span>
 									{/if}
-									<span class="icon icon16 fa-caret-down"></span>
+									{icon size=16 name='caret-down' type='solid'}
 								</a>
 							{/if}
 						</div>
diff --git a/wcfsetup/install/files/acp/templates/package.tpl b/wcfsetup/install/files/acp/templates/package.tpl
index 38da9a7ffc..66ccf95ca4 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}"><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}">{icon size=16 name='times' type='solid'} <span>{lang}wcf.acp.package.button.uninstall{/lang}</span></button></li>
 					{/if}
 
 					{event name='contentHeaderNavigation'}
@@ -201,7 +201,7 @@
 <footer class="contentFooter">
 	<nav class="contentFooterNavigation">
 		<ul>
-			<li><a href="{link controller='PackageList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <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/packageEnableUpgradeOverride.tpl b/wcfsetup/install/files/acp/templates/packageEnableUpgradeOverride.tpl
index 735be3917f..210fd3f612 100644
--- a/wcfsetup/install/files/acp/templates/packageEnableUpgradeOverride.tpl
+++ b/wcfsetup/install/files/acp/templates/packageEnableUpgradeOverride.tpl
@@ -8,7 +8,7 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='PackageList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <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='contentHeaderNavigation'}
 		</ul>
diff --git a/wcfsetup/install/files/acp/templates/packageList.tpl b/wcfsetup/install/files/acp/templates/packageList.tpl
index 73b33bdcba..9c7d867c7b 100644
--- a/wcfsetup/install/files/acp/templates/packageList.tpl
+++ b/wcfsetup/install/files/acp/templates/packageList.tpl
@@ -36,11 +36,11 @@
 			<ul>
 				{content}
 					{if $__wcf->session->getPermission('admin.configuration.package.canUpdatePackage')}
-						<li><a href="#" class="button jsButtonSearchForUpdates"><span class="icon icon16 fa-refresh"></span> <span>{lang}wcf.acp.package.searchForUpdates{/lang}</span></a></li>
+						<li><a href="#" class="button jsButtonSearchForUpdates">{icon size=16 name='arrows-rotate' type='solid'} <span>{lang}wcf.acp.package.searchForUpdates{/lang}</span></a></li>
 					{/if}
 
 					{if $__wcf->session->getPermission('admin.configuration.package.canInstallPackage')}
-						<li><a href="{link controller='PackageStartInstall'}action=install{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.package.startInstall{/lang}</span></a></li>
+						<li><a href="{link controller='PackageStartInstall'}action=install{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.package.startInstall{/lang}</span></a></li>
 					{/if}
 					
 					{event name='contentHeaderNavigation'}
@@ -138,7 +138,7 @@
 				<ul>
 					{content}
 						{if $__wcf->session->getPermission('admin.configuration.package.canInstallPackage')}
-							<li><a href="{link controller='PackageStartInstall'}action=install{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.package.startInstall{/lang}</span></a></li>
+							<li><a href="{link controller='PackageStartInstall'}action=install{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.package.startInstall{/lang}</span></a></li>
 						{/if}
 						
 						{event name='contentFooterNavigation'}
diff --git a/wcfsetup/install/files/acp/templates/packageSearchResultListItems.tpl b/wcfsetup/install/files/acp/templates/packageSearchResultListItems.tpl
index 0b1980d07e..fed487f55e 100644
--- a/wcfsetup/install/files/acp/templates/packageSearchResultListItems.tpl
+++ b/wcfsetup/install/files/acp/templates/packageSearchResultListItems.tpl
@@ -1,7 +1,7 @@
 {foreach from=$packages item=$package}
 	<tr class="jsPackageRow packageSearchResultRow">
 		<td class="columnIcon">
-			<a href="#" class="jsInstallPackage jsTooltip" data-confirm-message="{lang __encode=true}wcf.acp.package.install.confirmMessage{/lang}" data-package="{$package->package}" data-package-version="{$package->getAccessibleVersion()->packageVersion}" title="{lang}wcf.acp.package.button.installPackage{/lang}"><span class="icon icon24 fa-plus"></span></a>
+			<a href="#" class="jsInstallPackage jsTooltip" data-confirm-message="{lang __encode=true}wcf.acp.package.install.confirmMessage{/lang}" data-package="{$package->package}" data-package-version="{$package->getAccessibleVersion()->packageVersion}" title="{lang}wcf.acp.package.button.installPackage{/lang}">{icon size=24 name='plus' type='solid'}</a>
 		</td>
 		<td class="columnText">
 			<div class="packageSearchName">{$package->packageName} <span class="packageSearchVersion">{$package->getAccessibleVersion()->packageVersion}</span></div>
diff --git a/wcfsetup/install/files/acp/templates/packageStartInstall.tpl b/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
index 515b769692..b8151ea9f2 100644
--- a/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
+++ b/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
@@ -32,9 +32,9 @@
 	<nav class="contentHeaderNavigation">
 		<ul>
 			{if !ENABLE_ENTERPRISE_MODE || $__wcf->getUser()->hasOwnerAccess()}
-				<li><a href="#" class="button jsButtonUploadPackage jsStaticDialog" data-dialog-id="packageUploadDialog"><span class="icon icon16 fa-upload"></span> <span>{lang}wcf.acp.package.upload{/lang}</span></a></li>
+				<li><a href="#" class="button jsButtonUploadPackage jsStaticDialog" data-dialog-id="packageUploadDialog">{icon size=16 name='upload' type='solid'} <span>{lang}wcf.acp.package.upload{/lang}</span></a></li>
 			{/if}
-			<li><a href="{link controller='PackageList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <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='contentHeaderNavigation'}
 		</ul>
@@ -80,12 +80,12 @@
 		</div>
 		
 		<div class="packageSearchStatus packageSearchStatusRefreshDatabase">
-			<span class="icon icon64 fa-spinner"></span>
+			{icon size=64 name='spinner' type='solid'}
 			<span class="packageSearchStatusLabel">{lang}wcf.acp.package.search.status.refreshDatabase{/lang}</span>
 		</div>
 		
 		<div class="packageSearchStatus packageSearchStatusLoading">
-			<span class="icon icon64 fa-spinner"></span>
+			{icon size=64 name='spinner' type='solid'}
 			<span class="packageSearchStatusLabel">{lang}wcf.acp.package.search.status.loading{/lang}</span>
 		</div>
 		
diff --git a/wcfsetup/install/files/acp/templates/packageUpdateServerAdd.tpl b/wcfsetup/install/files/acp/templates/packageUpdateServerAdd.tpl
index 2fbd90177a..713435db4a 100644
--- a/wcfsetup/install/files/acp/templates/packageUpdateServerAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUpdateServerAdd.tpl
@@ -7,7 +7,7 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='PackageUpdateServerList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.package.server.list{/lang}</span></a></li>
+			<li><a href="{link controller='PackageUpdateServerList'}{/link}" class="button">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.menu.link.package.server.list{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
diff --git a/wcfsetup/install/files/acp/templates/packageUpdateServerList.tpl b/wcfsetup/install/files/acp/templates/packageUpdateServerList.tpl
index 7b067837d4..21a304654c 100644
--- a/wcfsetup/install/files/acp/templates/packageUpdateServerList.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUpdateServerList.tpl
@@ -7,7 +7,7 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='PackageUpdateServerAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.updateServer.add{/lang}</span></a></li>
+			<li><a href="{link controller='PackageUpdateServerAdd'}{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.updateServer.add{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
@@ -46,7 +46,7 @@
 							{else}
 								<span class="icon icon16 fa-check-square-o disabled"></span>
 							{/if}
-							<a href="{link controller='PackageUpdateServerEdit' id=$updateServer->packageUpdateServerID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 fa-pencil"></span></a>
+							<a href="{link controller='PackageUpdateServerEdit' id=$updateServer->packageUpdateServerID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil' type='solid'}</a>
 							{if $updateServer->canDelete()}
 								{objectAction action="delete" objectTitle=$updateServer->serverURL}
 							{else}
@@ -80,7 +80,7 @@
 		
 		<nav class="contentFooterNavigation">
 			<ul>
-				<li><a href="{link controller='PackageUpdateServerAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.updateServer.add{/lang}</span></a></li>
+				<li><a href="{link controller='PackageUpdateServerAdd'}{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.updateServer.add{/lang}</span></a></li>
 				
 				{event name='contentFooterNavigation'}
 			</ul>
diff --git a/wcfsetup/install/files/acp/templates/pageAdd.tpl b/wcfsetup/install/files/acp/templates/pageAdd.tpl
index 9fefd9594c..bc459c9ba1 100644
--- a/wcfsetup/install/files/acp/templates/pageAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/pageAdd.tpl
@@ -51,16 +51,16 @@
 		<ul>
 			{if $action == 'edit'}
 				{if $page->pageType !== 'system'}
-					<li><a href="#" class="button jsButtonCopyPage"><span class="icon icon16 fa-copy"></span> {lang}wcf.acp.page.button.copyPage{/lang}</a></li>
+					<li><a href="#" class="button jsButtonCopyPage">{icon size=16 name='copy' type='solid'} {lang}wcf.acp.page.button.copyPage{/lang}</a></li>
 				{/if}
 
 				{if !$page->requireObjectID}
-					<li><a href="{$page->getLink()}" class="button"><span class="icon icon16 fa-search"></span> <span>{lang}wcf.acp.page.button.viewPage{/lang}</span></a></li>
+					<li><a href="{$page->getLink()}" class="button">{icon size=16 name='search' type='solid'} <span>{lang}wcf.acp.page.button.viewPage{/lang}</span></a></li>
 				{/if}
 
-				<li><a href="{link controller='PageBoxOrder' id=$page->pageID}{/link}" class="button"><span class="icon icon16 fa-sort-amount-asc"></span> <span>{lang}wcf.acp.page.button.boxOrder{/lang}</span></a></li>
+				<li><a href="{link controller='PageBoxOrder' id=$page->pageID}{/link}" class="button">{icon size=16 name='arrow-down-short-wide' type='solid'} <span>{lang}wcf.acp.page.button.boxOrder{/lang}</span></a></li>
 			{/if}
-			<li><a href="{link controller='PageList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.cms.page.list{/lang}</span></a></li>
+			<li><a href="{link controller='PageList'}{/link}" class="button">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.menu.link.cms.page.list{/lang}</span></a></li>
 
 			{event name='contentHeaderNavigation'}
 		</ul>
diff --git a/wcfsetup/install/files/acp/templates/pageBoxOrder.tpl b/wcfsetup/install/files/acp/templates/pageBoxOrder.tpl
index c4e0c2f95b..b092dd684c 100644
--- a/wcfsetup/install/files/acp/templates/pageBoxOrder.tpl
+++ b/wcfsetup/install/files/acp/templates/pageBoxOrder.tpl
@@ -139,8 +139,8 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			{if $hasCustomShowOrder}<li><a href="#" class="button jsButtonCustomShowOrder"><span class="icon icon16 fa-times"></span> <span>{lang}wcf.acp.page.boxOrder.discard{/lang}</span></a></li>{/if}
-			<li><a href="{link controller='PageEdit' id=$page->pageID}{/link}" class="button"><span class="icon icon16 fa-pencil"></span> <span>{lang}wcf.acp.page.edit{/lang}</span></a></li>
+			{if $hasCustomShowOrder}<li><a href="#" class="button jsButtonCustomShowOrder">{icon size=16 name='times' type='solid'} <span>{lang}wcf.acp.page.boxOrder.discard{/lang}</span></a></li>{/if}
+			<li><a href="{link controller='PageEdit' id=$page->pageID}{/link}" class="button">{icon size=16 name='pencil' type='solid'} <span>{lang}wcf.acp.page.edit{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
diff --git a/wcfsetup/install/files/acp/templates/pageHeaderUser.tpl b/wcfsetup/install/files/acp/templates/pageHeaderUser.tpl
index e31c4aafa1..11e17b01e9 100644
--- a/wcfsetup/install/files/acp/templates/pageHeaderUser.tpl
+++ b/wcfsetup/install/files/acp/templates/pageHeaderUser.tpl
@@ -10,18 +10,18 @@
 				</li>
 				
 				<li id="jumpToPage">
-					<a href="{link forceFrontend=true}{/link}" class="jsTooltip" title="{lang}wcf.global.jumpToPage{/lang}"><span class="icon icon32 fa-home"></span></a>
+					<a href="{link forceFrontend=true}{/link}" class="jsTooltip" title="{lang}wcf.global.jumpToPage{/lang}">{icon size=32 name='house' type='solid'}</a>
 				</li>
 				
 				{if $__wcf->session->getPermission('admin.configuration.package.canUpdatePackage') && $__wcf->getAvailableUpdates()}
 					<li>
-						<a href="{link controller='PackageUpdate'}{/link}" class="jsTooltip" title="{lang}wcf.acp.package.updates{/lang}"><span class="icon icon32 fa-refresh"></span> <span class="badge badgeUpdate">{#$__wcf->getAvailableUpdates()}</span></a>
+						<a href="{link controller='PackageUpdate'}{/link}" class="jsTooltip" title="{lang}wcf.acp.package.updates{/lang}">{icon size=32 name='arrows-rotate' type='solid'} <span class="badge badgeUpdate">{#$__wcf->getAvailableUpdates()}</span></a>
 					</li>
 				{/if}
 			{/if}
 			
 			<li id="woltlab" class="dropdown">
-				<a href="#" class="dropdownToggle jsTooltip" title="WoltLab&reg;"><span class="icon icon32 fa-info"></span></a>
+				<a href="#" class="dropdownToggle jsTooltip" title="WoltLab&reg;">{icon size=32 name='info' type='solid'}</a>
 				
 				<ul class="dropdownMenu dropdownMenuUserPanel" data-dropdown-alignment-horizontal="right">
 					<li><a class="externalURL" href="https://www.woltlab.com/{if $__wcf->getLanguage()->getFixedLanguageCode() === 'de'}de/{/if}"{if EXTERNAL_LINK_TARGET_BLANK} target="_blank" rel="noopener"{/if}>{lang}wcf.acp.index.woltlab.website{/lang}</a></li>
diff --git a/wcfsetup/install/files/acp/templates/pageList.tpl b/wcfsetup/install/files/acp/templates/pageList.tpl
index ed3c6c6aec..31e9f43adf 100644
--- a/wcfsetup/install/files/acp/templates/pageList.tpl
+++ b/wcfsetup/install/files/acp/templates/pageList.tpl
@@ -7,7 +7,7 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="#" class="button jsButtonPageAdd"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.page.add{/lang}</span></a></li>
+			<li><a href="#" class="button jsButtonPageAdd">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.page.add{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
@@ -124,14 +124,14 @@
 							{else}
 								<span class="icon icon16 fa-{if !$page->isDisabled}check-{/if}square-o disabled" title="{lang}wcf.global.button.{if !$page->isDisabled}disable{else}enable{/if}{/lang}"></span>
 							{/if}
-							<a href="{link controller='PageEdit' id=$page->pageID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 fa-pencil"></span></a>
+							<a href="{link controller='PageEdit' id=$page->pageID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil' type='solid'}</a>
 							{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>
 							{/if}
 							{if !$page->requireObjectID}
-								<a href="{$page->getLink()}" title="{lang}wcf.acp.page.button.viewPage{/lang}" class="jsTooltip"><span class="icon icon16 fa-search"></span></a>
+								<a href="{$page->getLink()}" title="{lang}wcf.acp.page.button.viewPage{/lang}" class="jsTooltip">{icon size=16 name='search' type='solid'}</a>
 							{else}
 								<span class="icon icon16 fa-search disabled" title="{lang}wcf.acp.page.button.viewPage{/lang}"></span>
 							{/if}
@@ -169,7 +169,7 @@
 		
 		<nav class="contentFooterNavigation">
 			<ul>
-				<li><a href="#" class="button jsButtonPageAdd"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.page.add{/lang}</span></a></li>
+				<li><a href="#" class="button jsButtonPageAdd">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.page.add{/lang}</span></a></li>
 				
 				{event name='contentFooterNavigation'}
 			</ul>
diff --git a/wcfsetup/install/files/acp/templates/paidSubscriptionAdd.tpl b/wcfsetup/install/files/acp/templates/paidSubscriptionAdd.tpl
index 4b94085762..91a1549647 100644
--- a/wcfsetup/install/files/acp/templates/paidSubscriptionAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/paidSubscriptionAdd.tpl
@@ -24,7 +24,7 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='PaidSubscriptionList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.paidSubscription.list{/lang}</span></a></li>
+			<li><a href="{link controller='PaidSubscriptionList'}{/link}" class="button">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.menu.link.paidSubscription.list{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
diff --git a/wcfsetup/install/files/acp/templates/paidSubscriptionList.tpl b/wcfsetup/install/files/acp/templates/paidSubscriptionList.tpl
index 5188fc46f6..6fd4b47541 100644
--- a/wcfsetup/install/files/acp/templates/paidSubscriptionList.tpl
+++ b/wcfsetup/install/files/acp/templates/paidSubscriptionList.tpl
@@ -7,7 +7,7 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='PaidSubscriptionAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.paidSubscription.add{/lang}</span></a></li>
+			<li><a href="{link controller='PaidSubscriptionAdd'}{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.paidSubscription.add{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
@@ -40,9 +40,9 @@
 					<tr class="jsPaidSubscriptionRow jsObjectActionObject" data-object-id="{@$subscription->getObjectID()}">
 						<td class="columnIcon">
 							{objectAction action="toggle" isDisabled=$subscription->isDisabled}
-							<a href="{link controller='PaidSubscriptionEdit' id=$subscription->subscriptionID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 fa-pencil"></span></a>
+							<a href="{link controller='PaidSubscriptionEdit' id=$subscription->subscriptionID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil' type='solid'}</a>
 							{objectAction action="delete" objectTitle=$subscription->getTitle()}
-							<a href="{link controller='PaidSubscriptionUserAdd' id=$subscription->subscriptionID}{/link}" title="{lang}wcf.acp.paidSubscription.user.add{/lang}" class="jsTooltip"><span class="icon icon16 fa-plus"></span></a>
+							<a href="{link controller='PaidSubscriptionUserAdd' id=$subscription->subscriptionID}{/link}" title="{lang}wcf.acp.paidSubscription.user.add{/lang}" class="jsTooltip">{icon size=16 name='plus' type='solid'}</a>
 							
 							{event name='itemButtons'}
 						</td>
@@ -68,7 +68,7 @@
 		
 		<nav class="contentFooterNavigation">
 			<ul>
-				<li><a href="{link controller='PaidSubscriptionAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.paidSubscription.add{/lang}</span></a></li>
+				<li><a href="{link controller='PaidSubscriptionAdd'}{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.paidSubscription.add{/lang}</span></a></li>
 				
 				{event name='contentFooterNavigation'}
 			</ul>
diff --git a/wcfsetup/install/files/acp/templates/paidSubscriptionTransactionLog.tpl b/wcfsetup/install/files/acp/templates/paidSubscriptionTransactionLog.tpl
index 5f4d0aaf2d..065df82e7c 100644
--- a/wcfsetup/install/files/acp/templates/paidSubscriptionTransactionLog.tpl
+++ b/wcfsetup/install/files/acp/templates/paidSubscriptionTransactionLog.tpl
@@ -8,7 +8,7 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='PaidSubscriptionTransactionLogList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.paidSubscription.transactionLog.list{/lang}</span></a></li>
+			<li><a href="{link controller='PaidSubscriptionTransactionLogList'}{/link}" class="button">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.menu.link.paidSubscription.transactionLog.list{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
@@ -59,7 +59,7 @@
 <footer class="contentFooter">
 	<nav class="contentFooterNavigation">
 		<ul>
-			<li><a href="{link controller='PaidSubscriptionTransactionLogList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.paidSubscription.transactionLog.list{/lang}</span></a></li>
+			<li><a href="{link controller='PaidSubscriptionTransactionLogList'}{/link}" class="button">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.menu.link.paidSubscription.transactionLog.list{/lang}</span></a></li>
 			
 			{event name='contentFooterNavigation'}
 		</ul>
diff --git a/wcfsetup/install/files/acp/templates/paidSubscriptionUserAdd.tpl b/wcfsetup/install/files/acp/templates/paidSubscriptionUserAdd.tpl
index b0d10592d3..ccd65f46ca 100644
--- a/wcfsetup/install/files/acp/templates/paidSubscriptionUserAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/paidSubscriptionUserAdd.tpl
@@ -21,9 +21,9 @@
 	<nav class="contentHeaderNavigation">
 		<ul>
 			{if $action == 'add'}
-				<li><a href="{link controller='PaidSubscriptionList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.paidSubscription.list{/lang}</span></a></li>
+				<li><a href="{link controller='PaidSubscriptionList'}{/link}" class="button">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.menu.link.paidSubscription.list{/lang}</span></a></li>
 			{else}
-				<li><a href="{link controller='PaidSubscriptionUserList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.paidSubscription.user.list{/lang}</span></a></li>
+				<li><a href="{link controller='PaidSubscriptionUserList'}{/link}" class="button">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.menu.link.paidSubscription.user.list{/lang}</span></a></li>
 			{/if}
 			
 			{event name='contentHeaderNavigation'}
diff --git a/wcfsetup/install/files/acp/templates/paidSubscriptionUserList.tpl b/wcfsetup/install/files/acp/templates/paidSubscriptionUserList.tpl
index aa80cec8c8..d246193146 100644
--- a/wcfsetup/install/files/acp/templates/paidSubscriptionUserList.tpl
+++ b/wcfsetup/install/files/acp/templates/paidSubscriptionUserList.tpl
@@ -85,7 +85,7 @@
 					<tr class="jsPaidSubscriptionUserRow jsObjectActionObject" data-object-id="{@$subscriptionUser->getObjectID()}">
 						<td class="columnIcon">
 							{if $subscriptionUser->endDate}
-								<a href="{link controller='PaidSubscriptionUserEdit' id=$subscriptionUser->subscriptionUserID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 fa-pencil"></span></a>
+								<a href="{link controller='PaidSubscriptionUserEdit' id=$subscriptionUser->subscriptionUserID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil' type='solid'}</a>
 							{else}
 								<span class="icon icon16 fa-pencil disabled"></span>
 							{/if}
diff --git a/wcfsetup/install/files/acp/templates/reactionTypeAdd.tpl b/wcfsetup/install/files/acp/templates/reactionTypeAdd.tpl
index fc7ccf08f9..e301bace68 100644
--- a/wcfsetup/install/files/acp/templates/reactionTypeAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/reactionTypeAdd.tpl
@@ -7,7 +7,7 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='ReactionTypeList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.reactionType.list{/lang}</span></a></li>
+			<li><a href="{link controller='ReactionTypeList'}{/link}" class="button">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.menu.link.reactionType.list{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
diff --git a/wcfsetup/install/files/acp/templates/reactionTypeList.tpl b/wcfsetup/install/files/acp/templates/reactionTypeList.tpl
index c087c1938d..af2b5e2557 100644
--- a/wcfsetup/install/files/acp/templates/reactionTypeList.tpl
+++ b/wcfsetup/install/files/acp/templates/reactionTypeList.tpl
@@ -19,7 +19,7 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='ReactionTypeAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.menu.link.reactionType.add{/lang}</span></a></li>
+			<li><a href="{link controller='ReactionTypeAdd'}{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.menu.link.reactionType.add{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
diff --git a/wcfsetup/install/files/acp/templates/rebuildData.tpl b/wcfsetup/install/files/acp/templates/rebuildData.tpl
index 15b03fe1ea..fe1f4c150a 100644
--- a/wcfsetup/install/files/acp/templates/rebuildData.tpl
+++ b/wcfsetup/install/files/acp/templates/rebuildData.tpl
@@ -26,7 +26,7 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="#" class="button jsRebuildAll"><span class="icon icon16 fa-long-arrow-down"></span> <span>{lang}wcf.acp.rebuildData.rebuildAll{/lang}</span></a></li>
+			<li><a href="#" class="button jsRebuildAll">{icon size=16 name='down-long' type='solid'} <span>{lang}wcf.acp.rebuildData.rebuildAll{/lang}</span></a></li>
 			{event name='contentHeaderNavigation'}
 		</ul>
 	</nav>
diff --git a/wcfsetup/install/files/acp/templates/sitemapEdit.tpl b/wcfsetup/install/files/acp/templates/sitemapEdit.tpl
index 05c6c6916f..1df2153bee 100755
--- a/wcfsetup/install/files/acp/templates/sitemapEdit.tpl
+++ b/wcfsetup/install/files/acp/templates/sitemapEdit.tpl
@@ -8,7 +8,7 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='SitemapList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.maintenance.sitemap{/lang}</span></a></li>
+			<li><a href="{link controller='SitemapList'}{/link}" class="button">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.menu.link.maintenance.sitemap{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
diff --git a/wcfsetup/install/files/acp/templates/sitemapList.tpl b/wcfsetup/install/files/acp/templates/sitemapList.tpl
index 0c236befd3..d21b9b4050 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 class="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">{icon size=16 name='arrows-rotate' type='solid'} <span>{lang}wcf.acp.rebuildData.com.woltlab.wcf.sitemap{/lang}</span></button></li>
 
 			{event name='contentHeaderNavigation'}
 		</ul>
@@ -41,7 +41,7 @@
 								{assign var='sitemapIsDisabled' value=true}
 							{/if}
 							{objectAction action="toggle" isDisabled=$sitemapIsDisabled}
-							<a href="{link controller="SitemapEdit"}objectType={$object->objectType}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 fa-pencil"></span></a>
+							<a href="{link controller="SitemapEdit"}objectType={$object->objectType}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil' type='solid'}</a>
 						</td>
 						<td class="columnTitle columnSitemap"><a href="{link controller="SitemapEdit"}objectType={$object->objectType}{/link}">{lang}wcf.acp.sitemap.objectType.{$object->objectType}{/lang}</a></td>
 						<td class="columnInteger columnPriority">{$object->priority}</td>
diff --git a/wcfsetup/install/files/acp/templates/smileyAdd.tpl b/wcfsetup/install/files/acp/templates/smileyAdd.tpl
index 4e4924b28b..49fe81def0 100644
--- a/wcfsetup/install/files/acp/templates/smileyAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/smileyAdd.tpl
@@ -7,7 +7,7 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='SmileyList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.smiley.list{/lang}</span></a></li>
+			<li><a href="{link controller='SmileyList'}{/link}" class="button">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.menu.link.smiley.list{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
diff --git a/wcfsetup/install/files/acp/templates/smileyList.tpl b/wcfsetup/install/files/acp/templates/smileyList.tpl
index e107762e40..870e989f8c 100644
--- a/wcfsetup/install/files/acp/templates/smileyList.tpl
+++ b/wcfsetup/install/files/acp/templates/smileyList.tpl
@@ -19,7 +19,7 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='SmileyAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.smiley.add{/lang}</span></a></li>
+			<li><a href="{link controller='SmileyAdd'}{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.smiley.add{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
diff --git a/wcfsetup/install/files/acp/templates/styleAdd.tpl b/wcfsetup/install/files/acp/templates/styleAdd.tpl
index a623bf61e7..b068479604 100644
--- a/wcfsetup/install/files/acp/templates/styleAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/styleAdd.tpl
@@ -45,11 +45,11 @@
 	<nav class="contentHeaderNavigation">
 		<ul>
 			{if $action == 'edit'}
-				<li><a href="{link controller='StyleExport' id=$style->styleID}{/link}" class="button"><span class="icon icon16 fa-download"></span> <span>{lang}wcf.acp.style.exportStyle{/lang}</span></a></li>
-				<li><a class="jsCopyStyle button"><span class="icon icon16 fa-copy"></span> <span>{lang}wcf.acp.style.copyStyle{/lang}</span></a></li>
+				<li><a href="{link controller='StyleExport' id=$style->styleID}{/link}" class="button">{icon size=16 name='download' type='solid'} <span>{lang}wcf.acp.style.exportStyle{/lang}</span></a></li>
+				<li><a class="jsCopyStyle button">{icon size=16 name='copy' type='solid'} <span>{lang}wcf.acp.style.copyStyle{/lang}</span></a></li>
 			{/if}
 			
-			<li><a href="{link controller='StyleList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.style.list{/lang}</span></a></li>
+			<li><a href="{link controller='StyleList'}{/link}" class="button">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.menu.link.style.list{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
@@ -697,15 +697,15 @@
 									<div id="spEditor">
 										<div id="spEditorToolbar" data-region="wcfEditorButton">
 											<ul class="redactor-toolbar">
-												<li><a class="redactor-button-disabled"><span class="icon icon16 fa-file-code-o"></span></a></li>
-												<li><a><span class="icon icon16 fa-undo"></span></a></li>
-												<li><a><span class="icon icon16 fa-repeat"></span></a></li>
-												<li><a><span class="icon icon16 fa-expand"></span></a></li>
-												<li class="redactor-toolbar-separator"><a><span class="icon icon16 fa-header"></span></a></li>
-												<li class="redactor-toolbar-separator"><a><span class="icon icon16 fa-bold"></span></a></li>
-												<li><a class="dropact"><span class="icon icon16 fa-italic"></span></a></li>
-												<li><a><span class="icon icon16 fa-underline"></span></a></li>
-												<li><a><span class="icon icon16 fa-strikethrough"></span></a></li>
+												<li><a class="redactor-button-disabled">{icon size=16 name='file-code'}</a></li>
+												<li><a>{icon size=16 name='undo' type='solid'}</a></li>
+												<li><a>{icon size=16 name='arrow-rotate-right' type='solid'}</a></li>
+												<li><a>{icon size=16 name='up-right-and-down-left-from-center' type='solid'}</a></li>
+												<li class="redactor-toolbar-separator"><a>{icon size=16 name='heading' type='solid'}</a></li>
+												<li class="redactor-toolbar-separator"><a>{icon size=16 name='bold' type='solid'}</a></li>
+												<li><a class="dropact">{icon size=16 name='italic' type='solid'}</a></li>
+												<li><a>{icon size=16 name='underline' type='solid'}</a></li>
+												<li><a>{icon size=16 name='strikethrough' type='solid'}</a></li>
 											</ul>
 										</div>
 										<div id="spEditorContent">
@@ -742,13 +742,13 @@
 										<div class="userMenuHeader">
 											<div class="userMenuTitle">Lorem Ipsum</div>
 											<div class="userMenuButtons">
-												<a class="userMenuButton"><span class="icon icon24 fa-cog"></span></a>
+												<a class="userMenuButton">{icon size=24 name='cog' type='solid'}</a>
 											</div>
 										</div>
 										<div class="userMenuContent">
 											<div class="userMenuItem" data-is-unread="true">
 												<div class="userMenuItemImage">
-													<span class="icon icon48 fa-user"></span>
+													{icon size=48 name='user' type='solid'}
 												</div>
 												<div class="userMenuItemContent">
 													<a class="userMenuItemLink">
@@ -760,7 +760,7 @@
 												</div>
 												<div class="userMenuItemUnread">
 													<a class="userMenuItemMarkAsRead">
-														<span class="icon icon24 fa-check"></span>
+														{icon size=24 name='check' type='solid'}
 													</a>
 												</div>
 											</div>
diff --git a/wcfsetup/install/files/acp/templates/styleExport.tpl b/wcfsetup/install/files/acp/templates/styleExport.tpl
index c5c5d2eac1..672eb83738 100644
--- a/wcfsetup/install/files/acp/templates/styleExport.tpl
+++ b/wcfsetup/install/files/acp/templates/styleExport.tpl
@@ -7,7 +7,7 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='StyleList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.style.list{/lang}</span></a></li>
+			<li><a href="{link controller='StyleList'}{/link}" class="button">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.menu.link.style.list{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
diff --git a/wcfsetup/install/files/acp/templates/styleGlobalValues.tpl b/wcfsetup/install/files/acp/templates/styleGlobalValues.tpl
index 77425b4ba5..f2aa3222a9 100644
--- a/wcfsetup/install/files/acp/templates/styleGlobalValues.tpl
+++ b/wcfsetup/install/files/acp/templates/styleGlobalValues.tpl
@@ -8,7 +8,7 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='StyleList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.style.list{/lang}</span></a></li>
+			<li><a href="{link controller='StyleList'}{/link}" class="button">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.menu.link.style.list{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
diff --git a/wcfsetup/install/files/acp/templates/styleImport.tpl b/wcfsetup/install/files/acp/templates/styleImport.tpl
index ed7d5f34f6..99a5351440 100644
--- a/wcfsetup/install/files/acp/templates/styleImport.tpl
+++ b/wcfsetup/install/files/acp/templates/styleImport.tpl
@@ -7,7 +7,7 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='StyleList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.style.list{/lang}</span></a></li>
+			<li><a href="{link controller='StyleList'}{/link}" class="button">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.menu.link.style.list{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
diff --git a/wcfsetup/install/files/acp/templates/styleList.tpl b/wcfsetup/install/files/acp/templates/styleList.tpl
index ffdc2315ec..84d9e1cc0e 100644
--- a/wcfsetup/install/files/acp/templates/styleList.tpl
+++ b/wcfsetup/install/files/acp/templates/styleList.tpl
@@ -24,8 +24,8 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='StyleAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.menu.link.style.add{/lang}</span></a></li>
-			<li><a href="{link controller='StyleImport'}{/link}" class="button"><span class="icon icon16 fa-upload"></span> <span>{lang}wcf.acp.menu.link.style.import{/lang}</span></a></li>
+			<li><a href="{link controller='StyleAdd'}{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.menu.link.style.add{/lang}</span></a></li>
+			<li><a href="{link controller='StyleImport'}{/link}" class="button">{icon size=16 name='upload' type='solid'} <span>{lang}wcf.acp.menu.link.style.import{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
@@ -65,13 +65,13 @@
 						</dl>
 						<nav class="jsMobileNavigation buttonGroupNavigation">
 							<ul class="buttonList iconList" data-style-id="{@$style->styleID}">
-								<li><a href="{link controller='StyleEdit' id=$style->styleID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 fa-pencil"></span> <span class="invisible">{lang}wcf.global.button.edit{/lang}</span></a></li>
-								<li><a href="{link controller='StyleExport' id=$style->styleID}{/link}" title="{lang}wcf.acp.style.exportStyle{/lang}" class="jsTooltip"><span class="icon icon16 fa-download"></span> <span class="invisible">{lang}wcf.acp.style.exportStyle{/lang}</span></a></li>
+								<li><a href="{link controller='StyleEdit' id=$style->styleID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil' type='solid'} <span class="invisible">{lang}wcf.global.button.edit{/lang}</span></a></li>
+								<li><a href="{link controller='StyleExport' id=$style->styleID}{/link}" title="{lang}wcf.acp.style.exportStyle{/lang}" class="jsTooltip">{icon size=16 name='download' type='solid'} <span class="invisible">{lang}wcf.acp.style.exportStyle{/lang}</span></a></li>
 								
 								{if !$style->isDefault}
 									<li><a href="#" title="{lang}wcf.global.button.{if $style->isDisabled}enable{else}disable{/if}{/lang}" class="jsTooltip"><span class="icon icon16 fa-{if !$style->isDisabled}check-{/if}square-o jsObjectAction" data-object-action="toggle"></span> <span class="invisible">{lang}wcf.global.button.{if $style->isDisabled}enable{else}disable{/if}{/lang}</span></a></li>
-									<li><a href="#" title="{lang}wcf.acp.style.button.setAsDefault{/lang}" class="jsSetAsDefault jsTooltip"><span class="icon icon16 fa-check-circle"></span> <span class="invisible">{lang}wcf.acp.style.button.setAsDefault{/lang}</span></a></li>
-									<li><a href="#" title="{lang}wcf.global.button.delete{/lang}" class="jsDelete jsTooltip" data-confirm-message-html="{lang __encode=true}wcf.acp.style.delete.confirmMessage{/lang}"><span class="icon icon16 fa-times"></span> <span class="invisible">{lang}wcf.global.button.delete{/lang}</span></a></li>
+									<li><a href="#" title="{lang}wcf.acp.style.button.setAsDefault{/lang}" class="jsSetAsDefault jsTooltip">{icon size=16 name='check-circle' type='solid'} <span class="invisible">{lang}wcf.acp.style.button.setAsDefault{/lang}</span></a></li>
+									<li><a href="#" title="{lang}wcf.global.button.delete{/lang}" class="jsDelete jsTooltip" data-confirm-message-html="{lang __encode=true}wcf.acp.style.delete.confirmMessage{/lang}">{icon size=16 name='times' type='solid'} <span class="invisible">{lang}wcf.global.button.delete{/lang}</span></a></li>
 								{/if}
 								
 								{event name='itemButtons'}
@@ -93,8 +93,8 @@
 	
 	<nav class="contentFooterNavigation">
 		<ul>
-			<li><a href="{link controller='StyleAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.menu.link.style.add{/lang}</span></a></li>
-			<li><a href="{link controller='StyleImport'}{/link}" class="button"><span class="icon icon16 fa-upload"></span> <span>{lang}wcf.acp.menu.link.style.import{/lang}</span></a></li>
+			<li><a href="{link controller='StyleAdd'}{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.menu.link.style.add{/lang}</span></a></li>
+			<li><a href="{link controller='StyleImport'}{/link}" class="button">{icon size=16 name='upload' type='solid'} <span>{lang}wcf.acp.menu.link.style.import{/lang}</span></a></li>
 			
 			{event name='contentFooterNavigation'}
 		</ul>
diff --git a/wcfsetup/install/files/acp/templates/tagAdd.tpl b/wcfsetup/install/files/acp/templates/tagAdd.tpl
index d7c101dd4d..2f07c3f922 100644
--- a/wcfsetup/install/files/acp/templates/tagAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/tagAdd.tpl
@@ -7,7 +7,7 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='TagList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.tag.list{/lang}</span></a></li>
+			<li><a href="{link controller='TagList'}{/link}" class="button">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.menu.link.tag.list{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
diff --git a/wcfsetup/install/files/acp/templates/tagList.tpl b/wcfsetup/install/files/acp/templates/tagList.tpl
index ff969d85b2..967c7856fb 100644
--- a/wcfsetup/install/files/acp/templates/tagList.tpl
+++ b/wcfsetup/install/files/acp/templates/tagList.tpl
@@ -20,7 +20,7 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='TagAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.tag.add{/lang}</span></a></li>
+			<li><a href="{link controller='TagAdd'}{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.tag.add{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
@@ -76,7 +76,7 @@
 					<tr class="jsTagRow jsClipboardObject jsObjectActionObject" data-object-id="{@$tag->tagID}">
 						<td class="columnMark"><input type="checkbox" class="jsClipboardItem" data-object-id="{@$tag->tagID}"></td>
 						<td class="columnIcon">
-							<a href="{link controller='TagEdit' object=$tag}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 fa-pencil"></span></a>
+							<a href="{link controller='TagEdit' object=$tag}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil' type='solid'}</a>
 							{objectAction action="delete" objectTitle=$tag->getTitle()}
 							
 							{event name='rowButtons'}
@@ -103,7 +103,7 @@
 		
 		<nav class="contentFooterNavigation">
 			<ul>
-				<li><a href="{link controller='TagAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.tag.add{/lang}</span></a></li>
+				<li><a href="{link controller='TagAdd'}{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.tag.add{/lang}</span></a></li>
 				
 				{event name='contentFooterNavigation'}
 			</ul>
diff --git a/wcfsetup/install/files/acp/templates/templateAdd.tpl b/wcfsetup/install/files/acp/templates/templateAdd.tpl
index b893bd33ab..4bdd590917 100644
--- a/wcfsetup/install/files/acp/templates/templateAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/templateAdd.tpl
@@ -8,8 +8,8 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			{if $action == 'edit'}<li><a href="{link controller='TemplateDiff' id=$template->templateID}{/link}" class="button"><span class="icon icon16 fa-exchange"></span> <span>{lang}wcf.acp.template.diff{/lang}</span></a></li>{/if}
-			<li><a href="{link controller='TemplateList'}{if $action == 'edit'}templateGroupID={@$template->templateGroupID}{/if}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.template.list{/lang}</span></a></li>
+			{if $action == 'edit'}<li><a href="{link controller='TemplateDiff' id=$template->templateID}{/link}" class="button">{icon size=16 name='right-left' type='solid'} <span>{lang}wcf.acp.template.diff{/lang}</span></a></li>{/if}
+			<li><a href="{link controller='TemplateList'}{if $action == 'edit'}templateGroupID={@$template->templateGroupID}{/if}{/link}" class="button">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.menu.link.template.list{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
diff --git a/wcfsetup/install/files/acp/templates/templateDiff.tpl b/wcfsetup/install/files/acp/templates/templateDiff.tpl
index b83cb235a8..77240419b6 100644
--- a/wcfsetup/install/files/acp/templates/templateDiff.tpl
+++ b/wcfsetup/install/files/acp/templates/templateDiff.tpl
@@ -12,7 +12,7 @@
 				{content}
 					{if $diff !== null}
 						{if $parent->templateGroupID}
-							<li><a href="{link controller='TemplateEdit' id=$parent->templateID}{/link}" class="button"><span class="icon icon16 fa-pencil"></span> <span>{lang}wcf.global.button.edit{/lang}</span></a></li>
+							<li><a href="{link controller='TemplateEdit' id=$parent->templateID}{/link}" class="button">{icon size=16 name='pencil' type='solid'} <span>{lang}wcf.global.button.edit{/lang}</span></a></li>
 						{/if}
 					{/if}
 					
@@ -115,7 +115,7 @@
 				<footer class="contentFooter">
 					<nav class="contentFooterNavigation">
 						<ul>
-							<li><a href="{link controller='TemplateEdit' id=$template->templateID}{/link}" class="button"><span class="icon icon16 fa-pencil"></span> <span>{lang}wcf.global.button.edit{/lang}</span></a></li>
+							<li><a href="{link controller='TemplateEdit' id=$template->templateID}{/link}" class="button">{icon size=16 name='pencil' type='solid'} <span>{lang}wcf.global.button.edit{/lang}</span></a></li>
 							
 							{event name='contentFooterNavigation'}
 						</ul>
diff --git a/wcfsetup/install/files/acp/templates/templateGroupAdd.tpl b/wcfsetup/install/files/acp/templates/templateGroupAdd.tpl
index f8365d8692..0ebd01a227 100644
--- a/wcfsetup/install/files/acp/templates/templateGroupAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/templateGroupAdd.tpl
@@ -24,8 +24,8 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			{if $action === 'edit'}<li><a href="#" class="jsButtonCopy button"><span class="icon icon16 fa-files-o"></span> <span>{lang}wcf.acp.template.group.copy{/lang}</span></a></li>{/if}
-			<li><a href="{link controller='TemplateGroupList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.template.group.list{/lang}</span></a></li>
+			{if $action === 'edit'}<li><a href="#" class="jsButtonCopy button">{icon size=16 name='copy'} <span>{lang}wcf.acp.template.group.copy{/lang}</span></a></li>{/if}
+			<li><a href="{link controller='TemplateGroupList'}{/link}" class="button">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.menu.link.template.group.list{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
diff --git a/wcfsetup/install/files/acp/templates/templateGroupList.tpl b/wcfsetup/install/files/acp/templates/templateGroupList.tpl
index a34b69a72f..a3f0433ccc 100644
--- a/wcfsetup/install/files/acp/templates/templateGroupList.tpl
+++ b/wcfsetup/install/files/acp/templates/templateGroupList.tpl
@@ -7,7 +7,7 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='TemplateGroupAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.template.group.add{/lang}</span></a></li>
+			<li><a href="{link controller='TemplateGroupAdd'}{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.template.group.add{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
@@ -42,10 +42,10 @@
 							{if $templateGroup->isImmutable()}
 								<span class="icon icon16 fa-pencil disabled" title="{lang}wcf.global.button.edit{/lang}"></span>
 							{else}
-								<a href="{link controller='TemplateGroupEdit' id=$templateGroup->templateGroupID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 fa-pencil"></span></a>
+								<a href="{link controller='TemplateGroupEdit' id=$templateGroup->templateGroupID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil' type='solid'}</a>
 							{/if}
 							
-							<a href="{link controller='TemplateList' templateGroupID=$templateGroup->templateGroupID}{/link}" title="{lang}wcf.acp.template.list{/lang}" class="jsTooltip"><span class="icon icon16 fa-list"></span></a>
+							<a href="{link controller='TemplateList' templateGroupID=$templateGroup->templateGroupID}{/link}" title="{lang}wcf.acp.template.list{/lang}" class="jsTooltip">{icon size=16 name='list' type='solid'}</a>
 							
 							{if $templateGroup->isImmutable()}
 								<span class="icon icon16 fa-times disabled" title="{lang}wcf.global.button.delete{/lang}"></span>
@@ -86,7 +86,7 @@
 		
 		<nav class="contentFooterNavigation">
 			<ul>
-				<li><a href="{link controller='TemplateGroupAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.template.group.add{/lang}</span></a></li>
+				<li><a href="{link controller='TemplateGroupAdd'}{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.template.group.add{/lang}</span></a></li>
 				
 				{event name='contentFooterNavigation'}
 			</ul>
diff --git a/wcfsetup/install/files/acp/templates/templateList.tpl b/wcfsetup/install/files/acp/templates/templateList.tpl
index fef33f9950..f205114101 100644
--- a/wcfsetup/install/files/acp/templates/templateList.tpl
+++ b/wcfsetup/install/files/acp/templates/templateList.tpl
@@ -7,7 +7,7 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='TemplateAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.template.add{/lang}</span></a></li>
+			<li><a href="{link controller='TemplateAdd'}{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.template.add{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
@@ -95,11 +95,11 @@
 					{if $template->canCopy()}
 						<tr class="jsTemplateRow jsObjectActionObject" data-object-id="{@$template->getObjectID()}">
 							<td class="columnIcon">
-								<a href="{link controller='TemplateAdd'}copy={@$template->templateID}{/link}" title="{lang}wcf.acp.template.copy{/lang}" class="jsTooltip"><span class="icon icon16 fa-files-o"></span></a>
+								<a href="{link controller='TemplateAdd'}copy={@$template->templateID}{/link}" title="{lang}wcf.acp.template.copy{/lang}" class="jsTooltip">{icon size=16 name='copy'}</a>
 								
 								{if $template->templateGroupID}
-									<a href="{link controller='TemplateDiff' id=$template->templateID}{/link}" title="{lang}wcf.acp.template.diff{/lang}" class="jsTooltip"><span class="icon icon16 fa-exchange"></span></a>
-									<a href="{link controller='TemplateEdit' id=$template->templateID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 fa-pencil"></span></a>
+									<a href="{link controller='TemplateDiff' id=$template->templateID}{/link}" title="{lang}wcf.acp.template.diff{/lang}" class="jsTooltip">{icon size=16 name='right-left' type='solid'}</a>
+									<a href="{link controller='TemplateEdit' id=$template->templateID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil' type='solid'}</a>
 									{objectAction action="delete" objectTitle=$template->templateName}
 								{else}
 									<span class="icon icon16 fa-exchange disabled" title="{lang}wcf.acp.template.diff{/lang}"></span>
@@ -130,7 +130,7 @@
 		
 		<nav class="contentFooterNavigation">
 			<ul>
-				<li><a href="{link controller='TemplateAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.template.add{/lang}</span></a></li>
+				<li><a href="{link controller='TemplateAdd'}{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.template.add{/lang}</span></a></li>
 				
 				{event name='contentFooterNavigation'}
 			</ul>
diff --git a/wcfsetup/install/files/acp/templates/trophyAdd.tpl b/wcfsetup/install/files/acp/templates/trophyAdd.tpl
index 944b08e77b..0bc987c031 100644
--- a/wcfsetup/install/files/acp/templates/trophyAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/trophyAdd.tpl
@@ -51,7 +51,7 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='TrophyList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.trophy.list{/lang}</span></a></li>
+			<li><a href="{link controller='TrophyList'}{/link}" class="button">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.menu.link.trophy.list{/lang}</span></a></li>
 
 			{event name='contentHeaderNavigation'}
 		</ul>
@@ -254,7 +254,7 @@
 				<dt>{lang}wcf.acp.trophy.badge.iconName{/lang}</dt>
 				<dd>
 					<span class="jsTrophyIconName">{$iconName}</span>
-					<a href="#" class="button small"><span class="icon icon16 fa-search"></span></a>
+					<a href="#" class="button small">{icon size=16 name='search' type='solid'}</a>
 				</dd>
 			</dl>
 			
@@ -265,7 +265,7 @@
 						<span id="iconColorValue" class="colorBoxValue jsColorPicker" data-store="iconColorValue"></span>
 						<input type="hidden" id="iconColorValue">
 					</span>
-					<a href="#" class="button small jsButtonIconColorPicker"><span class="icon icon16 fa-paint-brush"></span></a>
+					<a href="#" class="button small jsButtonIconColorPicker">{icon size=16 name='paint-brush' type='solid'}</a>
 				</dd>
 			</dl>
 			
@@ -276,7 +276,7 @@
 						<span id="badgeColorValue" class="colorBoxValue jsColorPicker" data-store="badgeColorValue"></span>
 						<input type="hidden" id="badgeColorValue">
 					</span>
-					<a href="#" id="test" class="button small jsButtonBadgeColorPicker"><span class="icon icon16 fa-paint-brush"></span></a>
+					<a href="#" id="test" class="button small jsButtonBadgeColorPicker">{icon size=16 name='paint-brush' type='solid'}</a>
 				</dd>
 			</dl>
 		</div>
diff --git a/wcfsetup/install/files/acp/templates/trophyList.tpl b/wcfsetup/install/files/acp/templates/trophyList.tpl
index a33c93cc73..5ab230df94 100644
--- a/wcfsetup/install/files/acp/templates/trophyList.tpl
+++ b/wcfsetup/install/files/acp/templates/trophyList.tpl
@@ -17,7 +17,7 @@
 
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='TrophyAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.menu.link.trophy.add{/lang}</span></a></li>
+			<li><a href="{link controller='TrophyAdd'}{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.menu.link.trophy.add{/lang}</span></a></li>
 
 			{event name='contentHeaderNavigation'}
 		</ul>
@@ -43,7 +43,7 @@
 						<span class="statusDisplay sortableButtonContainer">
 							<span class="icon icon16 fa-arrows sortableNodeHandle"></span>
 							{objectAction action="toggle" isDisabled=$trophy->isDisabled}
-							<a href="{link controller='TrophyEdit' object=$trophy}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 fa-pencil"></span></a>
+							<a href="{link controller='TrophyEdit' object=$trophy}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil' type='solid'}</a>
 							{objectAction action="delete" objectTitle=$trophy->getTitle()}
 							
 							{event name='itemButtons'}
@@ -67,7 +67,7 @@
 
 		<nav class="contentFooterNavigation">
 			<ul>
-				<li><a href="{link controller='TrophyAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.menu.link.trophy.add{/lang}</span></a></li>
+				<li><a href="{link controller='TrophyAdd'}{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.menu.link.trophy.add{/lang}</span></a></li>
 
 				{event name='contentHeaderNavigation'}
 			</ul>
diff --git a/wcfsetup/install/files/acp/templates/userActivityPointOption.tpl b/wcfsetup/install/files/acp/templates/userActivityPointOption.tpl
index 0dc74ac1ef..1ad7e3ea78 100644
--- a/wcfsetup/install/files/acp/templates/userActivityPointOption.tpl
+++ b/wcfsetup/install/files/acp/templates/userActivityPointOption.tpl
@@ -21,7 +21,7 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a id="updateEvents" class="button"><span class="icon icon16 fa-repeat"></span> <span>{lang}wcf.acp.user.activityPoint.updateEvents{/lang}</span></a></li>
+			<li><a id="updateEvents" class="button">{icon size=16 name='arrow-rotate-right' type='solid'} <span>{lang}wcf.acp.user.activityPoint.updateEvents{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
diff --git a/wcfsetup/install/files/acp/templates/userAdd.tpl b/wcfsetup/install/files/acp/templates/userAdd.tpl
index 11ab69555b..07db3baeb1 100644
--- a/wcfsetup/install/files/acp/templates/userAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userAdd.tpl
@@ -19,7 +19,7 @@
 								*}data-email-confirmed="{if $user->isEmailConfirmed()}true{else}false{/if}" {*
 						*}>
 							<a href="#" class="dropdownToggle button">
-								<span class="icon icon16 fa-pencil"></span>
+								{icon size=16 name='pencil' type='solid'}
 								<span>{lang}wcf.global.button.edit{/lang}</span>
 							</a>
 
@@ -161,7 +161,7 @@
 				{/if}
 			{/hascontent}
 
-			<li><a href="{link controller='UserList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.user.list{/lang}</span></a></li>
+			<li><a href="{link controller='UserList'}{/link}" class="button">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.menu.link.user.list{/lang}</span></a></li>
 
 			{event name='contentHeaderNavigation'}
 		</ul>
diff --git a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
index 70e7b8be61..0e1c1af675 100644
--- a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
@@ -42,7 +42,7 @@
 			{if $action == 'edit'}
 				{if $availableUserGroups|count > 1}
 					<li class="dropdown">
-						<a class="button dropdownToggle"><span class="icon icon16 fa-sort"></span> <span>{lang}wcf.acp.group.button.choose{/lang}</span></a>
+						<a class="button dropdownToggle">{icon size=16 name='sort' type='solid'} <span>{lang}wcf.acp.group.button.choose{/lang}</span></a>
 						<div class="dropdownMenu">
 							<ul class="scrollableDropdownMenu">
 								{foreach from=$availableUserGroups item='availableUserGroup'}
@@ -54,11 +54,11 @@
 				{/if}
 				
 				{if $group->canCopy()}
-					<li><a class="jsButtonUserGroupCopy button"><span class="icon icon16 fa-copy"></span> <span>{lang}wcf.acp.group.button.copy{/lang}</span></a></li>
+					<li><a class="jsButtonUserGroupCopy button">{icon size=16 name='copy' type='solid'} <span>{lang}wcf.acp.group.button.copy{/lang}</span></a></li>
 				{/if}
 			{/if}
 			
-			<li><a href="{link controller='UserGroupList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.group.list{/lang}</span></a></li>
+			<li><a href="{link controller='UserGroupList'}{/link}" class="button">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.menu.link.group.list{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
@@ -70,7 +70,7 @@
 {/if}
 
 {if $action == 'edit' && $group->isOwner()}
-	<p class="info"><span class="icon icon16 fa-shield"></span> {lang}wcf.acp.group.type.owner.description{/lang}</p>
+	<p class="info">{icon size=16 name='shield' type='solid'} {lang}wcf.acp.group.type.owner.description{/lang}</p>
 {/if}
 
 {if $warningSelfEdit|isset}
diff --git a/wcfsetup/install/files/acp/templates/userGroupAssignmentAdd.tpl b/wcfsetup/install/files/acp/templates/userGroupAssignmentAdd.tpl
index 88ae5aec02..345500def3 100644
--- a/wcfsetup/install/files/acp/templates/userGroupAssignmentAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userGroupAssignmentAdd.tpl
@@ -7,7 +7,7 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='UserGroupAssignmentList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.group.assignment.button.list{/lang}</span></a></li>
+			<li><a href="{link controller='UserGroupAssignmentList'}{/link}" class="button">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.group.assignment.button.list{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
diff --git a/wcfsetup/install/files/acp/templates/userGroupAssignmentList.tpl b/wcfsetup/install/files/acp/templates/userGroupAssignmentList.tpl
index cd29a051eb..70e1f5a335 100644
--- a/wcfsetup/install/files/acp/templates/userGroupAssignmentList.tpl
+++ b/wcfsetup/install/files/acp/templates/userGroupAssignmentList.tpl
@@ -7,7 +7,7 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='UserGroupAssignmentAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.group.assignment.button.add{/lang}</span></a></li>
+			<li><a href="{link controller='UserGroupAssignmentAdd'}{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.group.assignment.button.add{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
@@ -38,7 +38,7 @@
 					<tr class="jsUserGroupAssignmentRow jsObjectActionObject" data-object-id="{@$assignment->getObjectID()}">
 						<td class="columnIcon">
 							{objectAction action="toggle" isDisabled=$assignment->isDisabled}
-							<a href="{link controller='UserGroupAssignmentEdit' object=$assignment}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 fa-pencil"></span></a>
+							<a href="{link controller='UserGroupAssignmentEdit' object=$assignment}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil' type='solid'}</a>
 							{objectAction action="delete" objectTitle=$assignment->getTitle()}
 							
 							{event name='rowButtons'}
@@ -67,7 +67,7 @@
 		
 		<nav class="contentFooterNavigation">
 			<ul>
-				<li><a href="{link controller='UserGroupAssignmentAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.group.assignment.button.add{/lang}</span></a></li>
+				<li><a href="{link controller='UserGroupAssignmentAdd'}{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.group.assignment.button.add{/lang}</span></a></li>
 				
 				{event name='contentFooterNavigation'}
 			</ul>
diff --git a/wcfsetup/install/files/acp/templates/userGroupBooleanOptionType.tpl b/wcfsetup/install/files/acp/templates/userGroupBooleanOptionType.tpl
index 4555982eaa..d8fa4786cc 100644
--- a/wcfsetup/install/files/acp/templates/userGroupBooleanOptionType.tpl
+++ b/wcfsetup/install/files/acp/templates/userGroupBooleanOptionType.tpl
@@ -1,16 +1,16 @@
 <ol class="flexibleButtonGroup optionTypeBoolean">
 	<li>
 		<input type="radio" id="{$option->optionName}"{if $value == 1} checked{/if} name="values[{$option->optionName}]" value="1"{if $disableOptions || $enableOptions} class="jsEnablesOptions" data-is-boolean="true" data-disable-options="[ {@$disableOptions}]" data-enable-options="[ {@$enableOptions}]"{/if}>
-		<label for="{$option->optionName}" class="green"><span class="icon icon16 fa-check"></span> {lang}wcf.acp.option.type.boolean.yes{/lang}</label>
+		<label for="{$option->optionName}" class="green">{icon size=16 name='check' type='solid'} {lang}wcf.acp.option.type.boolean.yes{/lang}</label>
 	</li>
 	<li>
 		<input type="radio" id="{$option->optionName}_no"{if $value == 0} checked{/if} name="values[{$option->optionName}]" value="0"{if $disableOptions || $enableOptions} class="jsEnablesOptions" data-is-boolean="true" data-disable-options="[ {@$disableOptions}]" data-enable-options="[ {@$enableOptions}]"{/if}>
-		<label for="{$option->optionName}_no" class="red"><span class="icon icon16 fa-times"></span> {lang}wcf.acp.option.type.boolean.no{/lang}</label>
+		<label for="{$option->optionName}_no" class="red">{icon size=16 name='times' type='solid'} {lang}wcf.acp.option.type.boolean.no{/lang}</label>
 	</li>
 	{if $option->optionName|mb_strpos:'admin.' !== 0 && ($group === null || (!$group->isEveryone() && !$group->isUsers()))}
 		<li>
 			<input type="radio" id="{$option->optionName}_never"{if $value == -1} checked{/if} name="values[{$option->optionName}]" value="-1"{if $disableOptions || $enableOptions} class="jsEnablesOptions" data-is-boolean="true" data-disable-options="[ {@$disableOptions}]" data-enable-options="[ {@$enableOptions}]"{/if}>
-			<label for="{$option->optionName}_never" class="yellow"><span class="icon icon16 fa-ban"></span> {lang}wcf.acp.option.type.boolean.never{/lang}</label>
+			<label for="{$option->optionName}_never" class="yellow">{icon size=16 name='ban' type='solid'} {lang}wcf.acp.option.type.boolean.never{/lang}</label>
 		</li>
 	{/if}
 </ol>
diff --git a/wcfsetup/install/files/acp/templates/userGroupList.tpl b/wcfsetup/install/files/acp/templates/userGroupList.tpl
index e2d3bcc9d9..70b795b9ad 100644
--- a/wcfsetup/install/files/acp/templates/userGroupList.tpl
+++ b/wcfsetup/install/files/acp/templates/userGroupList.tpl
@@ -10,7 +10,7 @@
 			<ul>
 				{content}
 					{if $__wcf->getSession()->getPermission('admin.user.canAddGroup')}
-						<li><a href="{link controller='UserGroupAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.group.add{/lang}</span></a></li>
+						<li><a href="{link controller='UserGroupAdd'}{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.group.add{/lang}</span></a></li>
 					{/if}
 						
 					{event name='contentHeaderNavigation'}
@@ -44,7 +44,7 @@
 				<tr id="groupContainer{@$group->groupID}" class="jsUserGroupRow jsObjectActionObject" data-object-id="{@$group->getObjectID()}">
 					<td class="columnIcon">
 						{if $group->isEditable()}
-							<a href="{link controller='UserGroupEdit' id=$group->groupID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 fa-pencil"></span></a>
+							<a href="{link controller='UserGroupEdit' id=$group->groupID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil' type='solid'}</a>
 						{else}
 							<span class="icon icon16 fa-pencil disabled" title="{lang}wcf.global.button.edit{/lang}"></span>
 						{/if}
@@ -96,7 +96,7 @@
 			<ul>
 				{content}
 					{if $__wcf->getSession()->getPermission('admin.user.canAddGroup')}
-						<li><a href="{link controller='UserGroupAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.group.add{/lang}</span></a></li>
+						<li><a href="{link controller='UserGroupAdd'}{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.group.add{/lang}</span></a></li>
 					{/if}
 					
 					{event name='contentFooterNavigation'}
diff --git a/wcfsetup/install/files/acp/templates/userList.tpl b/wcfsetup/install/files/acp/templates/userList.tpl
index 95dfb4e4cc..7bb72b6dd2 100644
--- a/wcfsetup/install/files/acp/templates/userList.tpl
+++ b/wcfsetup/install/files/acp/templates/userList.tpl
@@ -64,7 +64,7 @@
 				{content}
 					{if $__wcf->session->getPermission('admin.user.canSearchUser')}
 						<li class="dropdown">
-							<a class="button dropdownToggle"><span class="icon icon16 fa-search"></span> <span>{lang}wcf.acp.user.quickSearch{/lang}</span></a>
+							<a class="button dropdownToggle">{icon size=16 name='search' type='solid'} <span>{lang}wcf.acp.user.quickSearch{/lang}</span></a>
 							<ul class="dropdownMenu">
 								<li><a href="{link controller='UserQuickSearch'}mode=banned{/link}">{lang}wcf.acp.user.quickSearch.banned{/lang}</a></li>
 								<li><a href="{link controller='UserQuickSearch'}mode=newest{/link}">{lang}wcf.acp.user.quickSearch.newest{/lang}</a></li>
@@ -77,7 +77,7 @@
 					{/if}
 
 					{if $__wcf->session->getPermission('admin.user.canAddUser')}
-						<li><a href="{link controller='UserAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.user.add{/lang}</span></a></li>
+						<li><a href="{link controller='UserAdd'}{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.user.add{/lang}</span></a></li>
 					{/if}
 
 					{event name='contentHeaderNavigation'}
@@ -121,7 +121,7 @@
 						<td class="columnMark"><input type="checkbox" class="jsClipboardItem" data-object-id="{@$user->userID}"></td>
 						<td class="columnIcon">
 							<div class="dropdown" id="userListDropdown{@$user->userID}">
-								<a href="#" class="dropdownToggle button small"><span class="icon icon16 fa-pencil"></span> <span>{lang}wcf.global.button.edit{/lang}</span></a>
+								<a href="#" class="dropdownToggle button small">{icon size=16 name='pencil' type='solid'} <span>{lang}wcf.global.button.edit{/lang}</span></a>
 
 								<ul class="dropdownMenu">
 									{event name='dropdownItems'}
@@ -242,7 +242,7 @@
 				<ul>
 					{content}
 						{if $__wcf->session->getPermission('admin.user.canAddUser')}
-							<li><a href="{link controller='UserAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.user.add{/lang}</span></a></li>
+							<li><a href="{link controller='UserAdd'}{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.user.add{/lang}</span></a></li>
 						{/if}
 
 						{event name='contentFooterNavigation'}
diff --git a/wcfsetup/install/files/acp/templates/userMail.tpl b/wcfsetup/install/files/acp/templates/userMail.tpl
index 60b0fdb3c2..40bf39a97d 100644
--- a/wcfsetup/install/files/acp/templates/userMail.tpl
+++ b/wcfsetup/install/files/acp/templates/userMail.tpl
@@ -32,8 +32,8 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='UserList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.user.list{/lang}</span></a></li>
-			<li><a href="{link controller='UserSearch'}{/link}" class="button"><span class="icon icon16 fa-search"></span> <span>{lang}wcf.acp.user.search{/lang}</span></a></li>
+			<li><a href="{link controller='UserList'}{/link}" class="button">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.menu.link.user.list{/lang}</span></a></li>
+			<li><a href="{link controller='UserSearch'}{/link}" class="button">{icon size=16 name='search' type='solid'} <span>{lang}wcf.acp.user.search{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
diff --git a/wcfsetup/install/files/acp/templates/userOptionAdd.tpl b/wcfsetup/install/files/acp/templates/userOptionAdd.tpl
index 37eeb263ec..fa4540f530 100644
--- a/wcfsetup/install/files/acp/templates/userOptionAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userOptionAdd.tpl
@@ -7,7 +7,7 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='UserOptionList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.user.option.list{/lang}</span></a></li>
+			<li><a href="{link controller='UserOptionList'}{/link}" class="button">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.menu.link.user.option.list{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
diff --git a/wcfsetup/install/files/acp/templates/userOptionCategoryAdd.tpl b/wcfsetup/install/files/acp/templates/userOptionCategoryAdd.tpl
index 22df9d4b35..2734d2d178 100644
--- a/wcfsetup/install/files/acp/templates/userOptionCategoryAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userOptionCategoryAdd.tpl
@@ -7,7 +7,7 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='UserOptionCategoryList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.user.option.category.list{/lang}</span></a></li>
+			<li><a href="{link controller='UserOptionCategoryList'}{/link}" class="button">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.menu.link.user.option.category.list{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
diff --git a/wcfsetup/install/files/acp/templates/userOptionCategoryList.tpl b/wcfsetup/install/files/acp/templates/userOptionCategoryList.tpl
index b21359dea5..4951bab771 100644
--- a/wcfsetup/install/files/acp/templates/userOptionCategoryList.tpl
+++ b/wcfsetup/install/files/acp/templates/userOptionCategoryList.tpl
@@ -7,7 +7,7 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='UserOptionCategoryAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.user.option.category.add{/lang}</span></a></li>
+			<li><a href="{link controller='UserOptionCategoryAdd'}{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.user.option.category.add{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
@@ -39,7 +39,7 @@
 				{foreach from=$objects item=category}
 					<tr class="jsCategoryRow jsObjectActionObject" data-object-id="{@$category->getObjectID()}">
 						<td class="columnIcon">
-							<a href="{link controller='UserOptionCategoryEdit' id=$category->categoryID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 fa-pencil"></span></a>
+							<a href="{link controller='UserOptionCategoryEdit' id=$category->categoryID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil' type='solid'}</a>
 							{if $category->userOptions > 0}
 								<span class="icon icon16 fa-times disabled"></span>
 							{else}
@@ -69,7 +69,7 @@
 		
 		<nav class="contentFooterNavigation">
 			<ul>
-				<li><a href="{link controller='UserOptionCategoryAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.user.option.category.add{/lang}</span></a></li>
+				<li><a href="{link controller='UserOptionCategoryAdd'}{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.user.option.category.add{/lang}</span></a></li>
 				
 				{event name='contentFooterNavigation'}
 			</ul>
diff --git a/wcfsetup/install/files/acp/templates/userOptionList.tpl b/wcfsetup/install/files/acp/templates/userOptionList.tpl
index 90fb5e2088..51e9003451 100644
--- a/wcfsetup/install/files/acp/templates/userOptionList.tpl
+++ b/wcfsetup/install/files/acp/templates/userOptionList.tpl
@@ -7,7 +7,7 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='UserOptionAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.user.option.add{/lang}</span></a></li>
+			<li><a href="{link controller='UserOptionAdd'}{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.user.option.add{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
@@ -40,7 +40,7 @@
 					<tr class="jsOptionRow jsObjectActionObject" data-object-id="{@$option->getObjectID()}">
 						<td class="columnIcon">
 							{objectAction action="toggle" isDisabled=$option->isDisabled}
-							<a href="{link controller='UserOptionEdit' id=$option->optionID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 fa-pencil"></span></a>
+							<a href="{link controller='UserOptionEdit' id=$option->optionID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil' type='solid'}</a>
 							{if $option->canDelete()}
 								{objectAction action="delete" objectTitle=$option->getTitle()}
 							{else}
@@ -71,7 +71,7 @@
 		
 		<nav class="contentFooterNavigation">
 			<ul>
-				<li><a href="{link controller='UserOptionAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.user.option.add{/lang}</span></a></li>
+				<li><a href="{link controller='UserOptionAdd'}{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.user.option.add{/lang}</span></a></li>
 				
 				{event name='contentFooterNavigation'}
 			</ul>
diff --git a/wcfsetup/install/files/acp/templates/userRankAdd.tpl b/wcfsetup/install/files/acp/templates/userRankAdd.tpl
index 7f21dfeb50..6b80984047 100644
--- a/wcfsetup/install/files/acp/templates/userRankAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userRankAdd.tpl
@@ -31,7 +31,7 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='UserRankList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.user.rank.list{/lang}</span></a></li>
+			<li><a href="{link controller='UserRankList'}{/link}" class="button">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.menu.link.user.rank.list{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
diff --git a/wcfsetup/install/files/acp/templates/userRankList.tpl b/wcfsetup/install/files/acp/templates/userRankList.tpl
index 6d85e22b08..3702913850 100644
--- a/wcfsetup/install/files/acp/templates/userRankList.tpl
+++ b/wcfsetup/install/files/acp/templates/userRankList.tpl
@@ -24,8 +24,8 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a id="updateEvents" class="button"><span class="icon icon16 fa-repeat"></span> <span>{lang}wcf.acp.user.activityPoint.updateEvents{/lang}</span></a></li>
-			<li><a href="{link controller='UserRankAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.user.rank.add{/lang}</span></a></li>
+			<li><a id="updateEvents" class="button">{icon size=16 name='arrow-rotate-right' type='solid'} <span>{lang}wcf.acp.user.activityPoint.updateEvents{/lang}</span></a></li>
+			<li><a href="{link controller='UserRankAdd'}{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.user.rank.add{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
@@ -58,7 +58,7 @@
 				{foreach from=$objects item=userRank}
 					<tr class="jsUserRankRow jsObjectActionObject" data-object-id="{@$userRank->getObjectID()}">
 						<td class="columnIcon">
-							<a href="{link controller='UserRankEdit' id=$userRank->rankID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 fa-pencil"></span></a>
+							<a href="{link controller='UserRankEdit' id=$userRank->rankID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil' type='solid'}</a>
 							{objectAction action="delete" objectTitle=$userRank->getTitle()}
 							
 							{event name='rowButtons'}
@@ -96,7 +96,7 @@
 		
 		<nav class="contentFooterNavigation">
 			<ul>
-				<li><a href="{link controller='UserRankAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.user.rank.add{/lang}</span></a></li>
+				<li><a href="{link controller='UserRankAdd'}{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.user.rank.add{/lang}</span></a></li>
 				
 				{event name='contentFooterNavigation'}
 			</ul>
diff --git a/wcfsetup/install/files/acp/templates/userSearch.tpl b/wcfsetup/install/files/acp/templates/userSearch.tpl
index 050f6af5f2..72ec6089f2 100644
--- a/wcfsetup/install/files/acp/templates/userSearch.tpl
+++ b/wcfsetup/install/files/acp/templates/userSearch.tpl
@@ -14,7 +14,7 @@
 	<nav class="contentHeaderNavigation">
 		<ul>
 			<li class="dropdown">
-				<a class="button dropdownToggle"><span class="icon icon16 fa-search"></span> <span>{lang}wcf.acp.user.quickSearch{/lang}</span></a>
+				<a class="button dropdownToggle">{icon size=16 name='search' type='solid'} <span>{lang}wcf.acp.user.quickSearch{/lang}</span></a>
 				<ul class="dropdownMenu">
 					<li><a href="{link controller='UserQuickSearch'}mode=banned{/link}">{lang}wcf.acp.user.quickSearch.banned{/lang}</a></li>
 					<li><a href="{link controller='UserQuickSearch'}mode=newest{/link}">{lang}wcf.acp.user.quickSearch.newest{/lang}</a></li>
diff --git a/wcfsetup/install/files/acp/templates/userTrophyAdd.tpl b/wcfsetup/install/files/acp/templates/userTrophyAdd.tpl
index 186e3392f1..4cb06584bc 100644
--- a/wcfsetup/install/files/acp/templates/userTrophyAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userTrophyAdd.tpl
@@ -28,7 +28,7 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='UserTrophyList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.userTrophy.list{/lang}</span></a></li>
+			<li><a href="{link controller='UserTrophyList'}{/link}" class="button">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.menu.link.userTrophy.list{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
diff --git a/wcfsetup/install/files/acp/templates/userTrophyList.tpl b/wcfsetup/install/files/acp/templates/userTrophyList.tpl
index f5cbafbd20..423d53c8a3 100644
--- a/wcfsetup/install/files/acp/templates/userTrophyList.tpl
+++ b/wcfsetup/install/files/acp/templates/userTrophyList.tpl
@@ -13,7 +13,7 @@
 
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='UserTrophyAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.menu.link.userTrophy.add{/lang}</span></a></li>
+			<li><a href="{link controller='UserTrophyAdd'}{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.menu.link.userTrophy.add{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
@@ -122,7 +122,7 @@
 
 		<nav class="contentFooterNavigation">
 			<ul>
-				<li><a href="{link controller='UserTrophyAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.menu.link.userTrophy.add{/lang}</span></a></li>
+				<li><a href="{link controller='UserTrophyAdd'}{/link}" class="button">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.menu.link.userTrophy.add{/lang}</span></a></li>
 
 				{event name='contentHeaderNavigation'}
 			</ul>
diff --git a/wcfsetup/install/files/acp/templates/versionTrackerList.tpl b/wcfsetup/install/files/acp/templates/versionTrackerList.tpl
index 5456a683e2..41bf5372f7 100644
--- a/wcfsetup/install/files/acp/templates/versionTrackerList.tpl
+++ b/wcfsetup/install/files/acp/templates/versionTrackerList.tpl
@@ -9,8 +9,8 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{$object->getEditLink()}" class="button"><span class="icon icon16 fa-pencil"></span> <span>{lang}wcf.global.button.edit{/lang}</span></a></li>
-			<li><a href="{$object->getLink()}" class="button"><span class="icon icon16 fa-arrow-right"></span> <span>{lang}wcf.edit.button.goToContent{/lang}</span></a></li>
+			<li><a href="{$object->getEditLink()}" class="button">{icon size=16 name='pencil' type='solid'} <span>{lang}wcf.global.button.edit{/lang}</span></a></li>
+			<li><a href="{$object->getLink()}" class="button">{icon size=16 name='arrow-right' type='solid'} <span>{lang}wcf.edit.button.goToContent{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
diff --git a/wcfsetup/install/files/acp/templates/worker.tpl b/wcfsetup/install/files/acp/templates/worker.tpl
index 27e816a534..d7d7fda16a 100644
--- a/wcfsetup/install/files/acp/templates/worker.tpl
+++ b/wcfsetup/install/files/acp/templates/worker.tpl
@@ -1,6 +1,6 @@
 <div id="workerContainer">
 	<header class="box48 contentHeader">
-		<span class="icon icon48 fa-spinner"></span>
+		{icon size=48 name='spinner' type='solid'}
 		
 		<div>
 			<h1 class="contentTitle">{lang}wcf.global.worker.executing{/lang}</h1>
-- 
2.20.1