From b54e4ff87b78cf17b2ccbf05e2091c9c42eed4da Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Tue, 16 Aug 2022 16:48:56 +0200
Subject: [PATCH] Remove the `solid` flag when not required

---
 .../templates/__booleanFormField.tpl          |  4 +--
 com.woltlab.wcf/templates/aclSimple.tpl       |  8 +++---
 com.woltlab.wcf/templates/article.tpl         | 10 +++----
 com.woltlab.wcf/templates/articleAdd.tpl      | 10 +++----
 com.woltlab.wcf/templates/articleList.tpl     |  6 ++---
 .../templates/articleListItems.tpl            |  2 +-
 com.woltlab.wcf/templates/attachments.tpl     |  2 +-
 .../templates/booleanOptionType.tpl           |  4 +--
 .../templates/booleanSearchableOptionType.tpl |  4 +--
 com.woltlab.wcf/templates/boxArticleList.tpl  |  2 +-
 .../templates/categoryArticleList.tpl         |  6 ++---
 com.woltlab.wcf/templates/cms.tpl             |  4 +--
 com.woltlab.wcf/templates/codeMetaCode.tpl    |  2 +-
 com.woltlab.wcf/templates/commentList.tpl     |  4 +--
 .../templates/commentResponseList.tpl         |  4 +--
 .../templates/contentInteraction.tpl          |  2 +-
 com.woltlab.wcf/templates/editHistory.tpl     |  2 +-
 com.woltlab.wcf/templates/following.tpl       |  2 +-
 com.woltlab.wcf/templates/ignoredUsers.tpl    |  2 +-
 com.woltlab.wcf/templates/membersList.tpl     |  2 +-
 com.woltlab.wcf/templates/messageFormTabs.tpl |  6 ++---
 .../templates/messageFormTabsInline.tpl       |  6 ++---
 .../templates/moderationActivation.tpl        |  6 ++---
 com.woltlab.wcf/templates/moderationList.tpl  |  6 ++---
 .../templates/moderationReport.tpl            |  6 ++---
 .../templates/notificationList.tpl            |  2 +-
 .../templates/notificationSettings.tpl        |  4 +--
 com.woltlab.wcf/templates/pageHeaderUser.tpl  |  8 +++---
 .../templates/permissionDenied.tpl            |  4 +--
 com.woltlab.wcf/templates/tagged.tpl          |  2 +-
 .../templates/unreadArticleList.tpl           |  2 +-
 com.woltlab.wcf/templates/user.tpl            |  8 +++---
 .../templates/userInformationButtons.tpl      |  6 ++---
 .../templates/watchedArticleList.tpl          |  2 +-
 com.woltlab.wcf/templates/worker.tpl          |  2 +-
 .../templates/__bbcodeAttributesFormField.tpl | 16 ++++++------
 .../acp/templates/__booleanFormField.tpl      |  4 +--
 .../acp/templates/__optionRewriteTest.tpl     |  2 +-
 .../install/files/acp/templates/aclSimple.tpl |  8 +++---
 .../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/codeMetaCode.tpl      |  2 +-
 .../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 ++++-----
 .../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 +++----
 .../install/files/acp/templates/noticeAdd.tpl |  2 +-
 .../files/acp/templates/noticeList.tpl        |  6 ++---
 .../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  | 26 +++++++++----------
 .../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  |  2 +-
 .../files/acp/templates/templateGroupList.tpl |  8 +++---
 .../files/acp/templates/templateList.tpl      |  8 +++---
 .../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      |  6 ++---
 .../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 +-
 146 files changed, 357 insertions(+), 357 deletions(-)

diff --git a/com.woltlab.wcf/templates/__booleanFormField.tpl b/com.woltlab.wcf/templates/__booleanFormField.tpl
index c3b8421333..e3a962cb96 100644
--- a/com.woltlab.wcf/templates/__booleanFormField.tpl
+++ b/com.woltlab.wcf/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">{icon size=16 name='check' type='solid'} {lang}wcf.global.form.boolean.yes{/lang}</label>
+		<label for="{@$field->getPrefixedId()}" class="green">{icon size=16 name='check'} {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">{icon size=16 name='times' type='solid'} {lang}wcf.global.form.boolean.no{/lang}</label>
+		<label for="{@$field->getPrefixedId()}_no" class="red">{icon size=16 name='xmark'} {lang}wcf.global.form.boolean.no{/lang}</label>
 	</li>
 </ol>
diff --git a/com.woltlab.wcf/templates/aclSimple.tpl b/com.woltlab.wcf/templates/aclSimple.tpl
index 8c49e69801..2343ecee46 100644
--- a/com.woltlab.wcf/templates/aclSimple.tpl
+++ b/com.woltlab.wcf/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">{icon size=16 name='check' type='solid'} {lang}wcf.acp.option.type.boolean.yes{/lang}</label>
+					<label for="{@$__aclSimplePrefix}aclAllowAll" class="green">{icon size=16 name='check'} {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">{icon size=16 name='times' type='solid'} {lang}wcf.acp.option.type.boolean.no{/lang}</label>
+					<label for="{@$__aclSimplePrefix}aclAllowAll_no" class="red">{icon size=16 name='xmark'} {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">{icon size=16 name='check' type='solid'} {lang}wcf.acp.option.type.boolean.yes{/lang}</label>
+						<label for="{@$__aclSimplePrefix}invertPermissions" class="green">{icon size=16 name='check'} {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">{icon size=16 name='times' type='solid'} {lang}wcf.acp.option.type.boolean.no{/lang}</label>
+						<label for="{@$__aclSimplePrefix}invertPermissions_no" class="red">{icon size=16 name='xmark'} {lang}wcf.acp.option.type.boolean.no{/lang}</label>
 					</li>
 				</ol>
 				<small>{lang}wcf.acl.access.invertPermissions.description{/lang}</small>
diff --git a/com.woltlab.wcf/templates/article.tpl b/com.woltlab.wcf/templates/article.tpl
index 7dd49aba3c..0f34ab1b0e 100644
--- a/com.woltlab.wcf/templates/article.tpl
+++ b/com.woltlab.wcf/templates/article.tpl
@@ -9,7 +9,7 @@
 			<ul class="inlineList contentHeaderMetaData articleMetaData">
 				{if $article->hasLabels()}
 					<li>
-						{icon size=16 name='tags' type='solid'}
+						{icon size=16 name='tags'}
 						<ul class="labelList">
 							{foreach from=$article->getLabels() item=label}
 								<li>{@$label->render()}</li>
@@ -38,7 +38,7 @@
 				
 				{if $article->getDiscussionProvider()->getDiscussionCountPhrase()}
 					<li itemprop="interactionStatistic" itemscope itemtype="http://schema.org/InteractionCounter">
-						{icon size=16 name='comments' type='solid'}
+						{icon size=16 name='comments'}
 						{if $article->getDiscussionProvider()->getDiscussionLink()}<a href="{$article->getDiscussionProvider()->getDiscussionLink()}">{else}<span>{/if}
 						{$article->getDiscussionProvider()->getDiscussionCountPhrase()}
 						{if $article->getDiscussionProvider()->getDiscussionLink()}</a>{else}</span>{/if}
@@ -72,7 +72,7 @@
 			<nav class="contentHeaderNavigation">
 				<ul>
 					{content}
-						{if $article->canEdit()}<li><a href="{link controller='ArticleEdit' id=$article->articleID}{/link}" class="button buttonPrimary">{icon size=16 name='pencil' type='solid'} <span>{lang}wcf.acp.article.edit{/lang}</span></a></li>{/if}
+						{if $article->canEdit()}<li><a href="{link controller='ArticleEdit' id=$article->articleID}{/link}" class="button buttonPrimary">{icon size=16 name='pencil'} <span>{lang}wcf.acp.article.edit{/lang}</span></a></li>{/if}
 						{event name='contentHeaderNavigation'}
 					{/content}
 				</ul>
@@ -186,11 +186,11 @@
 				<ul class="articleLikeButtons buttonGroup buttonList smallButtons">
 					<li>
 						<a href="{$articleContent->getLink()}" class="button wsShareButton jsOnly" data-link-title="{$articleContent->getTitle()}">
-							{icon size=16 name='share-alt' type='solid'} <span>{lang}wcf.message.share{/lang}</span>
+							{icon size=16 name='share-nodes'} <span>{lang}wcf.message.share{/lang}</span>
 						</a>
 					</li>
 					{if $__wcf->session->getPermission('user.profile.canReportContent')}
-						<li class="jsReportArticle jsOnly" data-object-id="{@$articleContent->articleID}"><a href="#" title="{lang}wcf.moderation.report.reportContent{/lang}" class="button jsTooltip">{icon size=16 name='exclamation-triangle' type='solid'} <span class="invisible">{lang}wcf.moderation.report.reportContent{/lang}</span></a></li>
+						<li class="jsReportArticle jsOnly" data-object-id="{@$articleContent->articleID}"><a href="#" title="{lang}wcf.moderation.report.reportContent{/lang}" class="button jsTooltip">{icon size=16 name='triangle-exclamation'} <span class="invisible">{lang}wcf.moderation.report.reportContent{/lang}</span></a></li>
 					{/if}
 					{if MODULE_LIKE && ARTICLE_ENABLE_LIKE && $__wcf->session->getPermission('user.like.canLike') && $article->userID != $__wcf->user->userID}
 						<li class="jsOnly"><span class="button reactButton{if $articleLikeData[$article->articleID]|isset && $articleLikeData[$article->articleID]->reactionTypeID} active{/if}" title="{lang}wcf.reactions.react{/lang}" data-reaction-type-id="{if $articleLikeData[$article->articleID]|isset && $articleLikeData[$article->articleID]->reactionTypeID}{$articleLikeData[$article->articleID]->reactionTypeID}{else}0{/if}">{icon size=16 name='face-smile'} <span class="invisible">{lang}wcf.reactions.react{/lang}</span></span></li>
diff --git a/com.woltlab.wcf/templates/articleAdd.tpl b/com.woltlab.wcf/templates/articleAdd.tpl
index e3547a994a..a4edb5bb3c 100644
--- a/com.woltlab.wcf/templates/articleAdd.tpl
+++ b/com.woltlab.wcf/templates/articleAdd.tpl
@@ -15,7 +15,7 @@
 				<ul>
 					{content}
 						{if $action == 'edit'}
-							<li><a href="{$article->getLink()}" class="button buttonPrimary">{icon size=16 name='search' type='solid'} <span>{lang}wcf.acp.article.button.viewArticle{/lang}</span></a></li>
+							<li><a href="{$article->getLink()}" class="button buttonPrimary">{icon size=16 name='magnifying-glass'} <span>{lang}wcf.acp.article.button.viewArticle{/lang}</span></a></li>
 						{/if}
 						{event name='contentHeaderNavigation'}
 					{/content}
@@ -28,12 +28,12 @@
 {capture assign='contentInteractionButtons'}
 	{if $action == 'edit'}
 		{if $article->canDelete()}
-			<a href="#" class="contentInteractionButton button small 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='undo' type='solid'} <span>{lang}wcf.global.button.restore{/lang}</span></a>
-			<a href="#" class="contentInteractionButton button small 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>
-			<a href="#" class="contentInteractionButton button small 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>
+			<a href="#" class="contentInteractionButton button small 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='rotate-left'} <span>{lang}wcf.global.button.restore{/lang}</span></a>
+			<a href="#" class="contentInteractionButton button small 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='xmark'} <span>{lang}wcf.global.button.delete{/lang}</span></a>
+			<a href="#" class="contentInteractionButton button small 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='xmark'} <span>{lang}wcf.global.button.trash{/lang}</span></a>
 		{/if}
 		{if $languages|count > 1 || $article->isMultilingual}
-			<a href="#" class="contentInteractionButton button small jsButtonToggleI18n">{icon size=16 name='language' type='solid'} <span>{lang}wcf.acp.article.button.toggleI18n{/lang}</span></a>
+			<a href="#" class="contentInteractionButton button small jsButtonToggleI18n">{icon size=16 name='language'} <span>{lang}wcf.acp.article.button.toggleI18n{/lang}</span></a>
 		{/if}
 	{/if}
 {/capture}
diff --git a/com.woltlab.wcf/templates/articleList.tpl b/com.woltlab.wcf/templates/articleList.tpl
index b023102534..b4b3c3036f 100644
--- a/com.woltlab.wcf/templates/articleList.tpl
+++ b/com.woltlab.wcf/templates/articleList.tpl
@@ -16,9 +16,9 @@
 {capture assign='contentHeaderNavigation'}
 	{if $__wcf->getSession()->getPermission('admin.content.article.canManageArticle') || $__wcf->getSession()->getPermission('admin.content.article.canContributeArticle')}
 		{if $availableLanguages|count > 1}
-			<li><a href="#" class="button buttonPrimary jsButtonArticleAdd">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.article.add{/lang}</span></a></li>
+			<li><a href="#" class="button buttonPrimary jsButtonArticleAdd">{icon size=16 name='plus'} <span>{lang}wcf.acp.article.add{/lang}</span></a></li>
 		{else}
-			<li><a href="{link controller='ArticleAdd'}{/link}" class="button buttonPrimary">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.article.add{/lang}</span></a></li>
+			<li><a href="{link controller='ArticleAdd'}{/link}" class="button buttonPrimary">{icon size=16 name='plus'} <span>{lang}wcf.acp.article.add{/lang}</span></a></li>
 		{/if}
 	{/if}
 {/capture}
@@ -72,7 +72,7 @@
 		</ul>
 	</div>
 	{if ARTICLE_ENABLE_VISIT_TRACKING}
-		<a href="#" class="markAllAsReadButton contentInteractionButton button small jsOnly">{icon size=16 name='check' type='solid'} <span>{lang}wcf.global.button.markAllAsRead{/lang}</span></a>
+		<a href="#" class="markAllAsReadButton contentInteractionButton button small jsOnly">{icon size=16 name='check'} <span>{lang}wcf.global.button.markAllAsRead{/lang}</span></a>
 	{/if}
 {/capture}
 
diff --git a/com.woltlab.wcf/templates/articleListItems.tpl b/com.woltlab.wcf/templates/articleListItems.tpl
index ecf2ee6bad..b19270afe6 100644
--- a/com.woltlab.wcf/templates/articleListItems.tpl
+++ b/com.woltlab.wcf/templates/articleListItems.tpl
@@ -65,7 +65,7 @@
 					{/if}
 					{if $article->getDiscussionProvider()->getDiscussionCountPhrase()}{* empty phrase indicates that comments are disabled *}
 						<div class="contentItemMetaIcon">
-							{icon size=16 name='comments' type='solid'}
+							{icon size=16 name='comments'}
 							<span aria-label="{$article->getDiscussionProvider()->getDiscussionCountPhrase()}">
 								{$article->getDiscussionProvider()->getDiscussionCount()}
 							</span>
diff --git a/com.woltlab.wcf/templates/attachments.tpl b/com.woltlab.wcf/templates/attachments.tpl
index 5c181f66ef..03f7cb35c8 100644
--- a/com.woltlab.wcf/templates/attachments.tpl
+++ b/com.woltlab.wcf/templates/attachments.tpl
@@ -47,7 +47,7 @@
 											{@$attachment->filesize|filesize}
 										</li>
 										<li>
-											{icon size=16 name='up-right-and-down-left-from-center' type='solid'}
+											{icon size=16 name='up-right-and-down-left-from-center'}
 											{#$attachment->width}×{#$attachment->height}
 										</li>
 										<li>
diff --git a/com.woltlab.wcf/templates/booleanOptionType.tpl b/com.woltlab.wcf/templates/booleanOptionType.tpl
index db6b9358a8..707f696ef4 100644
--- a/com.woltlab.wcf/templates/booleanOptionType.tpl
+++ b/com.woltlab.wcf/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">{icon size=16 name='check' type='solid'} {lang}wcf.acp.option.type.boolean.yes{/lang}</label>
+		<label for="{$option->optionName}" class="green">{icon size=16 name='check'} {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">{icon size=16 name='times' type='solid'} {lang}wcf.acp.option.type.boolean.no{/lang}</label>
+		<label for="{$option->optionName}_no" class="red">{icon size=16 name='xmark'} {lang}wcf.acp.option.type.boolean.no{/lang}</label>
 	</li>
 </ol>
diff --git a/com.woltlab.wcf/templates/booleanSearchableOptionType.tpl b/com.woltlab.wcf/templates/booleanSearchableOptionType.tpl
index d66a1bfff9..de8173c260 100644
--- a/com.woltlab.wcf/templates/booleanSearchableOptionType.tpl
+++ b/com.woltlab.wcf/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">{icon size=16 name='check' type='solid'} {lang}wcf.acp.option.type.boolean.yes{/lang}</label>
+		<label for="{$option->optionName}" class="green">{icon size=16 name='check'} {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">{icon size=16 name='times' type='solid'} {lang}wcf.acp.option.type.boolean.no{/lang}</label>
+		<label for="{$option->optionName}_no" class="red">{icon size=16 name='xmark'} {lang}wcf.acp.option.type.boolean.no{/lang}</label>
 	</li>
 </ol>
 
diff --git a/com.woltlab.wcf/templates/boxArticleList.tpl b/com.woltlab.wcf/templates/boxArticleList.tpl
index cc791c9a26..48333004d4 100644
--- a/com.woltlab.wcf/templates/boxArticleList.tpl
+++ b/com.woltlab.wcf/templates/boxArticleList.tpl
@@ -47,7 +47,7 @@
 						</li>
 						
 						<li>
-							{icon size=16 name='comments' type='solid'}
+							{icon size=16 name='comments'}
 							{$boxArticle->getDiscussionProvider()->getDiscussionCountPhrase()}
 						</li>
 					</ul>
diff --git a/com.woltlab.wcf/templates/categoryArticleList.tpl b/com.woltlab.wcf/templates/categoryArticleList.tpl
index 3e3f43b189..e8af78ebe7 100644
--- a/com.woltlab.wcf/templates/categoryArticleList.tpl
+++ b/com.woltlab.wcf/templates/categoryArticleList.tpl
@@ -21,9 +21,9 @@
 {if $__wcf->getSession()->getPermission('admin.content.article.canManageArticle')}
 	{capture assign='contentHeaderNavigation'}
 		{if $availableLanguages|count > 1}
-			<li><a href="#" class="button buttonPrimary jsButtonArticleAdd">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.article.add{/lang}</span></a></li>
+			<li><a href="#" class="button buttonPrimary jsButtonArticleAdd">{icon size=16 name='plus'} <span>{lang}wcf.acp.article.add{/lang}</span></a></li>
 		{else}
-			<li><a href="{link controller='ArticleAdd'}categoryID={@$category->categoryID}{/link}" class="button buttonPrimary">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.article.add{/lang}</span></a></li>
+			<li><a href="{link controller='ArticleAdd'}categoryID={@$category->categoryID}{/link}" class="button buttonPrimary">{icon size=16 name='plus'} <span>{lang}wcf.acp.article.add{/lang}</span></a></li>
 		{/if}
 	{/capture}
 {/if}
@@ -67,7 +67,7 @@
 		<a href="#" class="contentInteractionButton jsSubscribeButton jsOnly button small{if $category->isSubscribed()} active{/if}" data-object-type="com.woltlab.wcf.article.category" data-object-id="{@$category->categoryID}"><span class="icon icon16 fa-bookmark{if !$category->isSubscribed()}-o{/if}"></span> <span>{lang}wcf.user.objectWatch.button.subscribe{/lang}</span></a>
 	{/if}
 	{if ARTICLE_ENABLE_VISIT_TRACKING}
-		<a href="#" class="markAllAsReadButton contentInteractionButton button small jsOnly">{icon size=16 name='check' type='solid'} <span>{lang}wcf.global.button.markAllAsRead{/lang}</span></a>
+		<a href="#" class="markAllAsReadButton contentInteractionButton button small jsOnly">{icon size=16 name='check'} <span>{lang}wcf.global.button.markAllAsRead{/lang}</span></a>
 	{/if}
 {/capture}
 
diff --git a/com.woltlab.wcf/templates/cms.tpl b/com.woltlab.wcf/templates/cms.tpl
index 04a7ffdb11..b122a07a61 100644
--- a/com.woltlab.wcf/templates/cms.tpl
+++ b/com.woltlab.wcf/templates/cms.tpl
@@ -13,7 +13,7 @@
 
 {capture assign='contentInteractionButtons'}
 	{if $page->showShareButtons()}
-		<a href="{$content->getLink()}" class="contentInteractionButton button small wsShareButton jsOnly" data-link-title="{$content->getTitle()}">{icon size=16 name='share' type='solid'} <span>{lang}wcf.message.share{/lang}</span></a>
+		<a href="{$content->getLink()}" class="contentInteractionButton button small wsShareButton jsOnly" data-link-title="{$content->getTitle()}">{icon size=16 name='share'} <span>{lang}wcf.message.share{/lang}</span></a>
 	{/if}
 
 	{if $page->isMultilingual && $__wcf->user->userID && $page->getPageLanguages()|count > 1}
@@ -35,7 +35,7 @@
 		</div>
 	{/if}
 
-	{if $__wcf->getSession()->getPermission('admin.content.cms.canManagePage')}<a href="{link controller='PageEdit' id=$page->pageID isACP=true}{/link}" class="contentInteractionButton button small">{icon size=16 name='pencil' type='solid'} <span>{lang}wcf.acp.page.edit{/lang}</span></a>{/if}
+	{if $__wcf->getSession()->getPermission('admin.content.cms.canManagePage')}<a href="{link controller='PageEdit' id=$page->pageID isACP=true}{/link}" class="contentInteractionButton button small">{icon size=16 name='pencil'} <span>{lang}wcf.acp.page.edit{/lang}</span></a>{/if}
 {/capture}
 
 {include file='header'}
diff --git a/com.woltlab.wcf/templates/codeMetaCode.tpl b/com.woltlab.wcf/templates/codeMetaCode.tpl
index ec8ed023d3..6cb38d173f 100644
--- a/com.woltlab.wcf/templates/codeMetaCode.tpl
+++ b/com.woltlab.wcf/templates/codeMetaCode.tpl
@@ -4,7 +4,7 @@
 		
 		{if !$isAmp && $lines > 10}
 			<span class="toggleButton jsTooltip pointer" title="{lang}wcf.bbcode.button.showAll{/lang}" data-title-collapse="{lang}wcf.bbcode.button.collapse{/lang}" data-title-expand="{lang}wcf.bbcode.button.showAll{/lang}" role="button" tabindex="0">
-				{icon size=24 name='up-right-and-down-left-from-center' type='solid'}
+				{icon size=24 name='up-right-and-down-left-from-center'}
 			</span>
 		{/if}
 	</div>
diff --git a/com.woltlab.wcf/templates/commentList.tpl b/com.woltlab.wcf/templates/commentList.tpl
index de0b45ebba..0723ff7d04 100644
--- a/com.woltlab.wcf/templates/commentList.tpl
+++ b/com.woltlab.wcf/templates/commentList.tpl
@@ -48,10 +48,10 @@
 						<nav class="jsMobileNavigation buttonGroupNavigation">
 							<ul class="buttonList iconList">
 								{if $comment->isDisabled && $commentCanModerate}
-									<li class="jsOnly"><a href="#" class="jsEnableComment">{icon size=16 name='check' type='solid'} <span class="invisible">{lang}wcf.comment.approve{/lang}</span></a></li>
+									<li class="jsOnly"><a href="#" class="jsEnableComment">{icon size=16 name='check'} <span class="invisible">{lang}wcf.comment.approve{/lang}</span></a></li>
 								{/if}
 								{if $commentManager->supportsReport() && $__wcf->session->getPermission('user.profile.canReportContent')}
-									<li class="jsReportCommentComment jsOnly" data-object-id="{@$comment->commentID}"><a href="#" title="{lang}wcf.moderation.report.reportContent{/lang}" class="jsTooltip">{icon size=16 name='exclamation-triangle' type='solid'} <span class="invisible">{lang}wcf.moderation.report.reportContent{/lang}</span></a></li>
+									<li class="jsReportCommentComment jsOnly" data-object-id="{@$comment->commentID}"><a href="#" title="{lang}wcf.moderation.report.reportContent{/lang}" class="jsTooltip">{icon size=16 name='triangle-exclamation'} <span class="invisible">{lang}wcf.moderation.report.reportContent{/lang}</span></a></li>
 								{/if}
 								
 								{if MODULE_LIKE && $commentManager->supportsLike() && $__wcf->session->getPermission('user.like.canLike') && $comment->userID != $__wcf->user->userID}
diff --git a/com.woltlab.wcf/templates/commentResponseList.tpl b/com.woltlab.wcf/templates/commentResponseList.tpl
index 607b9694b2..6011866863 100644
--- a/com.woltlab.wcf/templates/commentResponseList.tpl
+++ b/com.woltlab.wcf/templates/commentResponseList.tpl
@@ -40,10 +40,10 @@
 					<nav class="jsMobileNavigation buttonGroupNavigation">
 						<ul class="buttonList iconList">
 							{if $response->isDisabled && $commentCanModerate}
-								<li class="jsOnly"><a href="#" class="jsEnableResponse">{icon size=16 name='check' type='solid'} <span class="invisible">{lang}wcf.comment.approve{/lang}</span></a></li>
+								<li class="jsOnly"><a href="#" class="jsEnableResponse">{icon size=16 name='check'} <span class="invisible">{lang}wcf.comment.approve{/lang}</span></a></li>
 							{/if}
 							{if $commentManager->supportsReport() && $__wcf->session->getPermission('user.profile.canReportContent')}
-								<li class="jsReportCommentResponse jsOnly" data-object-id="{@$response->responseID}"><a href="#" title="{lang}wcf.moderation.report.reportContent{/lang}" class="jsTooltip">{icon size=16 name='exclamation-triangle' type='solid'} <span class="invisible">{lang}wcf.moderation.report.reportContent{/lang}</span></a></li>
+								<li class="jsReportCommentResponse jsOnly" data-object-id="{@$response->responseID}"><a href="#" title="{lang}wcf.moderation.report.reportContent{/lang}" class="jsTooltip">{icon size=16 name='triangle-exclamation'} <span class="invisible">{lang}wcf.moderation.report.reportContent{/lang}</span></a></li>
 							{/if}
 							
 							{if MODULE_LIKE && $commentManager->supportsLike() && $__wcf->session->getPermission('user.like.canLike') && $response->userID != $__wcf->user->userID}<li class="jsOnly"><a href="#" class="reactButtonCommentResponse jsTooltip {if $likeData[response][$response->responseID]|isset && $likeData[response][$response->responseID]->reactionTypeID} active{/if}" title="{lang}wcf.reactions.react{/lang}" data-reaction-type-id="{if $likeData[response][$response->responseID]|isset && $likeData[response][$response->responseID]->reactionTypeID}{$likeData[response][$response->responseID]->reactionTypeID}{else}0{/if}">{icon size=16 name='face-smile'} <span class="invisible">{lang}wcf.reactions.react{/lang}</span></a></li>{/if}
diff --git a/com.woltlab.wcf/templates/contentInteraction.tpl b/com.woltlab.wcf/templates/contentInteraction.tpl
index 7639ee11dc..3ecc125e96 100644
--- a/com.woltlab.wcf/templates/contentInteraction.tpl
+++ b/com.woltlab.wcf/templates/contentInteraction.tpl
@@ -39,7 +39,7 @@
 
                 {if $__contentInteractionDropdownItems}
                     <div class="contentInteractionDropdown dropdown jsOnly">
-                        <a href="#" class="button small dropdownToggle" aria-label="{lang}wcf.global.button.more{/lang}">{icon size=16 name='ellipsis-v' type='solid'}</a>
+                        <a href="#" class="button small dropdownToggle" aria-label="{lang}wcf.global.button.more{/lang}">{icon size=16 name='ellipsis-vertical'}</a>
 
                         <ul class="contentInteractionDropdownItems dropdownMenu">
                             {@$__contentInteractionDropdownItems}
diff --git a/com.woltlab.wcf/templates/editHistory.tpl b/com.woltlab.wcf/templates/editHistory.tpl
index a0b97def66..cbf641e932 100644
--- a/com.woltlab.wcf/templates/editHistory.tpl
+++ b/com.woltlab.wcf/templates/editHistory.tpl
@@ -2,7 +2,7 @@
 
 {capture assign='contentTitle'}{lang}wcf.edit.versions{/lang}: {$object->getTitle()}{/capture}
 
-{capture assign='contentHeaderNavigation'}<li><a href="{$object->getLink()}" class="button buttonPrimary">{icon size=16 name='arrow-right' type='solid'} <span>{lang}wcf.edit.button.goToContent{/lang}</span></a></li>{/capture}
+{capture assign='contentHeaderNavigation'}<li><a href="{$object->getLink()}" class="button buttonPrimary">{icon size=16 name='arrow-right'} <span>{lang}wcf.edit.button.goToContent{/lang}</span></a></li>{/capture}
 
 {include file='header'}
 
diff --git a/com.woltlab.wcf/templates/following.tpl b/com.woltlab.wcf/templates/following.tpl
index 87f0d2d21c..2083e347f9 100644
--- a/com.woltlab.wcf/templates/following.tpl
+++ b/com.woltlab.wcf/templates/following.tpl
@@ -21,7 +21,7 @@
 							
 							<nav class="jsMobileNavigation buttonGroupNavigation">
 								<ul class="buttonList iconList jsOnly">
-									<li><a class="pointer jsTooltip jsObjectAction" data-object-action="delete" title="{lang}wcf.user.button.unfollow{/lang}" data-object-id="{@$user->followID}">{icon size=16 name='times' type='solid'} <span class="invisible">{lang}wcf.user.button.unfollow{/lang}</span></a></li>
+									<li><a class="pointer jsTooltip jsObjectAction" data-object-action="delete" title="{lang}wcf.user.button.unfollow{/lang}" data-object-id="{@$user->followID}">{icon size=16 name='xmark'} <span class="invisible">{lang}wcf.user.button.unfollow{/lang}</span></a></li>
 									{event name='userButtons'}
 								</ul>
 							</nav>
diff --git a/com.woltlab.wcf/templates/ignoredUsers.tpl b/com.woltlab.wcf/templates/ignoredUsers.tpl
index 1bb6c4986d..ecb63b4355 100644
--- a/com.woltlab.wcf/templates/ignoredUsers.tpl
+++ b/com.woltlab.wcf/templates/ignoredUsers.tpl
@@ -23,7 +23,7 @@
 								<ul class="buttonList iconList jsOnly">
 									<li>
 										<a class="pointer jsTooltip jsEditIgnoreButton" title="{lang}wcf.global.button.edit{/lang}">
-											{icon size=16 name='pencil' type='solid'}
+											{icon size=16 name='pencil'}
 											<span class="invisible">{lang}wcf.global.button.edit{/lang}</span>
 										</a>
 									</li>
diff --git a/com.woltlab.wcf/templates/membersList.tpl b/com.woltlab.wcf/templates/membersList.tpl
index af785bab6b..128a848a0d 100644
--- a/com.woltlab.wcf/templates/membersList.tpl
+++ b/com.woltlab.wcf/templates/membersList.tpl
@@ -72,7 +72,7 @@
 			{/hascontent}
 			
 			<div class="containerListFilterOptions jsOnly">
-				<button class="button small jsStaticDialog" data-dialog-id="membersListSortFilter">{icon size=16 name='filter' type='solid'} {lang}wcf.global.filter{/lang}</button>
+				<button class="button small jsStaticDialog" data-dialog-id="membersListSortFilter">{icon size=16 name='filter'} {lang}wcf.global.filter{/lang}</button>
 			</div>
 		</div>
 		<ol class="containerList userList">
diff --git a/com.woltlab.wcf/templates/messageFormTabs.tpl b/com.woltlab.wcf/templates/messageFormTabs.tpl
index d7f3c768dc..6fcc28463e 100644
--- a/com.woltlab.wcf/templates/messageFormTabs.tpl
+++ b/com.woltlab.wcf/templates/messageFormTabs.tpl
@@ -6,10 +6,10 @@
 		<ul>
 			{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}
 			{if !$attachmentHandler|empty && $attachmentHandler->canUpload()}
-				<li data-name="attachments"><a>{icon size=16 name='paperclip' type='solid'} <span>{lang}wcf.attachment.attachments{/lang}</span></a></li>
+				<li data-name="attachments"><a>{icon size=16 name='paperclip'} <span>{lang}wcf.attachment.attachments{/lang}</span></a></li>
 			{/if}
-			{if $__messageFormSettings}<li data-name="settings"><a>{icon size=16 name='cog' type='solid'} <span>{lang}wcf.message.settings{/lang}</span></a></li>{/if}
-			{if $__showPoll|isset && $__showPoll}<li data-name="poll"><a>{icon size=16 name='chart-column' type='solid'} <span>{lang}wcf.poll.management{/lang}</span></a></li>{/if}
+			{if $__messageFormSettings}<li data-name="settings"><a>{icon size=16 name='gear'} <span>{lang}wcf.message.settings{/lang}</span></a></li>{/if}
+			{if $__showPoll|isset && $__showPoll}<li data-name="poll"><a>{icon size=16 name='chart-column'} <span>{lang}wcf.poll.management{/lang}</span></a></li>{/if}
 			{event name='tabMenuTabs'}
 		</ul>
 	</nav>
diff --git a/com.woltlab.wcf/templates/messageFormTabsInline.tpl b/com.woltlab.wcf/templates/messageFormTabsInline.tpl
index 1edf169b49..e60168bdb4 100644
--- a/com.woltlab.wcf/templates/messageFormTabsInline.tpl
+++ b/com.woltlab.wcf/templates/messageFormTabsInline.tpl
@@ -10,10 +10,10 @@
 		<ul>
 			{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}
 			{if !$attachmentHandler|empty && $attachmentHandler->canUpload()}
-				<li data-name="attachments"><a>{icon size=16 name='paperclip' type='solid'} <span>{lang}wcf.attachment.attachments{/lang}</span></a></li>
+				<li data-name="attachments"><a>{icon size=16 name='paperclip'} <span>{lang}wcf.attachment.attachments{/lang}</span></a></li>
 			{/if}
-			{if $__messageFormSettingsInlineContent}<li data-name="settings"><a>{icon size=16 name='cog' type='solid'} <span>{lang}wcf.message.settings{/lang}</span></a></li>{/if}
-			{if $__showPoll|isset && $__showPoll}<li data-name="poll"><a>{icon size=16 name='chart-column' type='solid'} <span>{lang}wcf.poll.management{/lang}</span></a></li>{/if}
+			{if $__messageFormSettingsInlineContent}<li data-name="settings"><a>{icon size=16 name='gear'} <span>{lang}wcf.message.settings{/lang}</span></a></li>{/if}
+			{if $__showPoll|isset && $__showPoll}<li data-name="poll"><a>{icon size=16 name='chart-column'} <span>{lang}wcf.poll.management{/lang}</span></a></li>{/if}
 			{event name='tabMenuTabs'}
 		</ul>
 	</nav>
diff --git a/com.woltlab.wcf/templates/moderationActivation.tpl b/com.woltlab.wcf/templates/moderationActivation.tpl
index c575451897..507cc3c407 100644
--- a/com.woltlab.wcf/templates/moderationActivation.tpl
+++ b/com.woltlab.wcf/templates/moderationActivation.tpl
@@ -35,7 +35,7 @@
 			<nav class="contentHeaderNavigation">
 				<ul>
 					{content}
-						{if $queue->getAffectedObject()}<li><a href="{$queue->getAffectedObject()->getLink()}" class="button buttonPrimary">{icon size=16 name='arrow-right' type='solid'} <span>{lang}wcf.moderation.jumpToContent{/lang}</span></a></li>{/if}
+						{if $queue->getAffectedObject()}<li><a href="{$queue->getAffectedObject()->getLink()}" class="button buttonPrimary">{icon size=16 name='arrow-right'} <span>{lang}wcf.moderation.jumpToContent{/lang}</span></a></li>{/if}
 						{event name='contentHeaderNavigation'}
 					{/content}
 				</ul>
@@ -47,8 +47,8 @@
 {capture assign='contentInteractionButtons'}
 	<a id="moderationAssignUser" class="contentInteractionButton button small jsOnly">{icon size=16 name='user-plus' type='solid'} <span>{lang}wcf.moderation.assignedUser.change{/lang}</span></a>
 	{if !$queue->isDone()}
-		<a id="enableContent" class="contentInteractionButton button small jsOnly">{icon size=16 name='check' type='solid'} <span>{lang}wcf.moderation.activation.enableContent{/lang}</span></a>
-		{if $queueManager->canRemoveContent($queue->getDecoratedObject())}<a id="removeContent" class="contentInteractionButton button small jsOnly">{icon size=16 name='times' type='solid'} <span>{lang}wcf.moderation.activation.removeContent{/lang}</span></a>{/if}
+		<a id="enableContent" class="contentInteractionButton button small jsOnly">{icon size=16 name='check'} <span>{lang}wcf.moderation.activation.enableContent{/lang}</span></a>
+		{if $queueManager->canRemoveContent($queue->getDecoratedObject())}<a id="removeContent" class="contentInteractionButton button small jsOnly">{icon size=16 name='xmark'} <span>{lang}wcf.moderation.activation.removeContent{/lang}</span></a>{/if}
 	{/if}
 {/capture}
 
diff --git a/com.woltlab.wcf/templates/moderationList.tpl b/com.woltlab.wcf/templates/moderationList.tpl
index 4ecf22872c..c6d2e7eeef 100644
--- a/com.woltlab.wcf/templates/moderationList.tpl
+++ b/com.woltlab.wcf/templates/moderationList.tpl
@@ -11,8 +11,8 @@
 {/capture}
 
 {capture assign='contentInteractionButtons'}
-	<a href="#" class="markAllAsReadButton contentInteractionButton button small jsOnly">{icon size=16 name='check' type='solid'} <span>{lang}wcf.global.button.markAllAsRead{/lang}</span></a>
-	<a href="{link controller='DeletedContentList'}{/link}" class="contentInteractionButton button small">{icon size=16 name='trash-can' type='solid'} <span>{lang}wcf.moderation.showDeletedContent{/lang}</span></a>
+	<a href="#" class="markAllAsReadButton contentInteractionButton button small jsOnly">{icon size=16 name='check'} <span>{lang}wcf.global.button.markAllAsRead{/lang}</span></a>
+	<a href="{link controller='DeletedContentList'}{/link}" class="contentInteractionButton button small">{icon size=16 name='trash-can'} <span>{lang}wcf.moderation.showDeletedContent{/lang}</span></a>
 {/capture}
 
 {include file='header'}
@@ -82,7 +82,7 @@
 						</li>
 					{/hascontent}
 					<li class="columnApplyFilter jsOnly">
-						<button class="button small jsStaticDialog" data-dialog-id="moderationListSortFilter">{icon size=16 name='filter' type='solid'} {lang}wcf.global.filter{/lang}</button>
+						<button class="button small jsStaticDialog" data-dialog-id="moderationListSortFilter">{icon size=16 name='filter'} {lang}wcf.global.filter{/lang}</button>
 					</li>
 				</ol>
 			</li>
diff --git a/com.woltlab.wcf/templates/moderationReport.tpl b/com.woltlab.wcf/templates/moderationReport.tpl
index 196a9bbd75..029c1168bb 100644
--- a/com.woltlab.wcf/templates/moderationReport.tpl
+++ b/com.woltlab.wcf/templates/moderationReport.tpl
@@ -35,7 +35,7 @@
 			<nav class="contentHeaderNavigation">
 				<ul>
 					{content}
-						{if $queue->getAffectedObject()}<li><a href="{$queue->getAffectedObject()->getLink()}" class="button buttonPrimary">{icon size=16 name='arrow-right' type='solid'} <span>{lang}wcf.moderation.jumpToContent{/lang}</span></a></li>{/if}
+						{if $queue->getAffectedObject()}<li><a href="{$queue->getAffectedObject()->getLink()}" class="button buttonPrimary">{icon size=16 name='arrow-right'} <span>{lang}wcf.moderation.jumpToContent{/lang}</span></a></li>{/if}
 						{event name='contentHeaderNavigation'}
 					{/content}
 				</ul>
@@ -48,12 +48,12 @@
 	<a id="moderationAssignUser" class="contentInteractionButton button small jsOnly">{icon size=16 name='user-plus' type='solid'} <span>{lang}wcf.moderation.assignedUser.change{/lang}</span></a>
 	{if !$queue->isDone()}
 		{if $queueManager->canRemoveContent($queue->getDecoratedObject())}
-			<a id="removeContent" class="contentInteractionButton button small jsOnly">{icon size=16 name='times' type='solid'} <span>{lang}wcf.moderation.activation.removeContent{/lang}</span></a>
+			<a id="removeContent" class="contentInteractionButton button small jsOnly">{icon size=16 name='xmark'} <span>{lang}wcf.moderation.activation.removeContent{/lang}</span></a>
 		{/if}
 		<a id="removeReport" class="contentInteractionButton button small jsOnly">{icon size=16 name='square-check'} <span>{lang}wcf.moderation.report.removeReport{/lang}</span></a>
 	{/if}
 	{if $queue->canChangeJustifiedStatus()}
-		<a id="changeJustifiedStatus" class="contentInteractionButton button small jsOnly">{icon size=16 name='arrows-rotate' type='solid'} <span>{lang}wcf.moderation.report.changeJustifiedStatus{/lang}</span></a>
+		<a id="changeJustifiedStatus" class="contentInteractionButton button small jsOnly">{icon size=16 name='arrows-rotate'} <span>{lang}wcf.moderation.report.changeJustifiedStatus{/lang}</span></a>
 	{/if}
 {/capture}
 
diff --git a/com.woltlab.wcf/templates/notificationList.tpl b/com.woltlab.wcf/templates/notificationList.tpl
index 3ee98f92ee..96a30974e1 100644
--- a/com.woltlab.wcf/templates/notificationList.tpl
+++ b/com.woltlab.wcf/templates/notificationList.tpl
@@ -10,7 +10,7 @@
 
 {capture assign='contentInteractionButtons'}
 	{if $__wcf->getUserNotificationHandler()->getNotificationCount()}
-		<a href="#" class="jsMarkAllAsConfirmed contentInteractionButton button small jsOnly">{icon size=16 name='check' type='solid'} <span>{lang}wcf.global.button.markAllAsRead{/lang}</span></a>
+		<a href="#" class="jsMarkAllAsConfirmed contentInteractionButton button small jsOnly">{icon size=16 name='check'} <span>{lang}wcf.global.button.markAllAsRead{/lang}</span></a>
 	{/if}
 {/capture}
 
diff --git a/com.woltlab.wcf/templates/notificationSettings.tpl b/com.woltlab.wcf/templates/notificationSettings.tpl
index 606394b75e..afeb35352c 100644
--- a/com.woltlab.wcf/templates/notificationSettings.tpl
+++ b/com.woltlab.wcf/templates/notificationSettings.tpl
@@ -39,9 +39,9 @@
 								<button class="notificationSettingsEmailType jsTooltip{if $settings[$event->eventID][enabled]|empty} disabled{/if}" title="{lang}wcf.user.notification.mailNotificationType.{@$settings[$event->eventID][mailNotificationType]}{/lang}" data-object-id="{@$event->eventID}">
 									<span class="jsIconNotificationSettingsEmailType">
 										{if $settings[$event->eventID][mailNotificationType] === 'none'}
-											{icon size=24 name='xmark' type='solid'}
+											{icon size=24 name='xmark'}
 										{else if $settings[$event->eventID][mailNotificationType] === 'instant'}
-											{icon size=24 name='bolt' type='solid'}
+											{icon size=24 name='bolt'}
 										{else}
 											{icon size=24 name='clock'}
 										{/if}
diff --git a/com.woltlab.wcf/templates/pageHeaderUser.tpl b/com.woltlab.wcf/templates/pageHeaderUser.tpl
index ede5fd3581..0cd2a61ae5 100644
--- a/com.woltlab.wcf/templates/pageHeaderUser.tpl
+++ b/com.woltlab.wcf/templates/pageHeaderUser.tpl
@@ -52,7 +52,7 @@
 					<div class="userMenuContent">
 						<div class="userMenuItem userMenuItemNarrow userMenuItemSingleLine">
 							<div class="userMenuItemImage">
-								{icon size=32 name='pencil' type='solid'}
+								{icon size=32 name='pencil'}
 							</div>
 							<div class="userMenuItemContent">
 								<a href="{link controller='User' object=$__wcf->user editOnInit=true}{/link}" class="userMenuItemLink">{lang}wcf.user.editProfile{/lang}</a>
@@ -61,7 +61,7 @@
 						{if $__wcf->session->getPermission('admin.general.canUseAcp')}
 						<div class="userMenuItem userMenuItemNarrow userMenuItemSingleLine">
 							<div class="userMenuItemImage">
-								{icon size=32 name='wrench' type='solid'}
+								{icon size=32 name='wrench'}
 							</div>
 							<div class="userMenuItemContent">
 								<a href="{link isACP=true}{/link}" class="userMenuItemLink">{lang}wcf.global.acp{/lang}</a>
@@ -183,7 +183,7 @@
 						aria-haspopup="true"
 						aria-expanded="false"
 					>
-						{icon size=32 name='exclamation-triangle' type='solid'}
+						{icon size=32 name='triangle-exclamation'}
 						<span>{lang}wcf.moderation.moderation{/lang}</span>
 						{if $__wcf->getModerationQueueManager()->getUnreadModerationCount()}<span class="badge badgeUpdate">{#$__wcf->getModerationQueueManager()->getUnreadModerationCount()}</span>{/if}
 					</a>
@@ -209,7 +209,7 @@
 		
 		<!-- page search -->
 		<li>
-			<a href="{link controller='Search'}{/link}" id="userPanelSearchButton" class="jsTooltip" title="{lang}wcf.global.search{/lang}">{icon size=32 name='search' type='solid'} <span>{lang}wcf.global.search{/lang}</span></a>
+			<a href="{link controller='Search'}{/link}" id="userPanelSearchButton" class="jsTooltip" title="{lang}wcf.global.search{/lang}">{icon size=32 name='magnifying-glass'} <span>{lang}wcf.global.search{/lang}</span></a>
 		</li>
 	</ul>
 </nav>
diff --git a/com.woltlab.wcf/templates/permissionDenied.tpl b/com.woltlab.wcf/templates/permissionDenied.tpl
index 77884fe4dd..5ab8b02163 100644
--- a/com.woltlab.wcf/templates/permissionDenied.tpl
+++ b/com.woltlab.wcf/templates/permissionDenied.tpl
@@ -2,7 +2,7 @@
 {capture assign='contentTitle'}{lang}wcf.page.error.permissionDenied.title{/lang}{/capture}
 {if !$isFirstVisit}
 	{capture assign='contentHeaderNavigation'}
-		<li id="backToReferrer" style="display: none"><a href="#" class="button" rel="noopener">{icon size=16 name='arrow-left' type='solid'} {lang}wcf.page.error.backward{/lang}</a></li>
+		<li id="backToReferrer" style="display: none"><a href="#" class="button" rel="noopener">{icon size=16 name='arrow-left'} {lang}wcf.page.error.backward{/lang}</a></li>
 	{/capture}
 	
 	<script data-relocate="true">
@@ -35,7 +35,7 @@
 		<h2 class="sectionTitle">{lang}wcf.user.login{/lang}</h2>
 		
 		<p>{lang}wcf.page.error.loginAvailable{/lang}</p>
-		<p style="margin-top: 20px"><a href="{link controller='Login' url=$__wcf->getRequestURI()}{/link}" class="button">{icon size=16 name='key' type='solid'} {lang}wcf.user.loginOrRegister{/lang}</a></p>
+		<p style="margin-top: 20px"><a href="{link controller='Login' url=$__wcf->getRequestURI()}{/link}" class="button">{icon size=16 name='key'} {lang}wcf.user.loginOrRegister{/lang}</a></p>
 	</section>
 {/if}
 
diff --git a/com.woltlab.wcf/templates/tagged.tpl b/com.woltlab.wcf/templates/tagged.tpl
index 6332320555..d68b0b9fc7 100644
--- a/com.woltlab.wcf/templates/tagged.tpl
+++ b/com.woltlab.wcf/templates/tagged.tpl
@@ -41,7 +41,7 @@
 {/capture}
 
 {capture assign='contentInteractionButtons'}
-	<a href="{link controller='TagSearch'}{/link}" class="contentInteractionButton button small">{icon size=16 name='search' type='solid'} <span>{lang}wcf.search.type.tags{/lang}</span></a>
+	<a href="{link controller='TagSearch'}{/link}" class="contentInteractionButton button small">{icon size=16 name='magnifying-glass'} <span>{lang}wcf.search.type.tags{/lang}</span></a>
 {/capture}
 
 {include file='header'}
diff --git a/com.woltlab.wcf/templates/unreadArticleList.tpl b/com.woltlab.wcf/templates/unreadArticleList.tpl
index b282ccb58b..82d1464516 100644
--- a/com.woltlab.wcf/templates/unreadArticleList.tpl
+++ b/com.woltlab.wcf/templates/unreadArticleList.tpl
@@ -45,7 +45,7 @@
 
 {capture assign='contentInteractionButtons'}
 	{if ARTICLE_ENABLE_VISIT_TRACKING}
-		<a href="#" class="markAllAsReadButton contentInteractionButton button small jsOnly">{icon size=16 name='check' type='solid'} <span>{lang}wcf.global.button.markAllAsRead{/lang}</span></a>
+		<a href="#" class="markAllAsReadButton contentInteractionButton button small jsOnly">{icon size=16 name='check'} <span>{lang}wcf.global.button.markAllAsRead{/lang}</span></a>
 	{/if}
 {/capture}
 
diff --git a/com.woltlab.wcf/templates/user.tpl b/com.woltlab.wcf/templates/user.tpl
index 4ffc7870e5..239a3ba4b0 100644
--- a/com.woltlab.wcf/templates/user.tpl
+++ b/com.woltlab.wcf/templates/user.tpl
@@ -149,7 +149,7 @@
 		<div class="userProfileCoverPhoto" style="background-image: url({$user->getCoverPhoto()->getURL()})">
 			{if ($user->userID == $__wcf->user->userID || $user->canEdit()) && ($__wcf->getSession()->getPermission('user.profile.coverPhoto.canUploadCoverPhoto') || $user->coverPhotoHash)}
 				<div class="userProfileManageCoverPhoto dropdown jsOnly">
-					<a href="#" class="button small dropdownToggle">{icon size=16 name='pencil' type='solid'} {lang}wcf.user.coverPhoto.edit{/lang}</a>
+					<a href="#" class="button small dropdownToggle">{icon size=16 name='pencil'} {lang}wcf.user.coverPhoto.edit{/lang}</a>
 					<ul class="dropdownMenu">
 						{if $__wcf->getSession()->getPermission('user.profile.coverPhoto.canUploadCoverPhoto')}
 							<li><a href="#" class="jsButtonUploadCoverPhoto jsStaticDialog" data-dialog-id="userProfileCoverPhotoUpload">{lang}wcf.user.coverPhoto.upload{/lang}</a></li>
@@ -238,7 +238,7 @@
 				<ul class="userProfileButtonContainer">
 					{content}
 						{if $user->canEdit() || ($__wcf->getUser()->userID == $user->userID && $user->canEditOwnProfile())}
-							<li><a href="#" class="jsButtonEditProfile button buttonPrimary">{icon size=16 name='pencil' type='solid'} <span>{lang}wcf.user.editProfile{/lang}</span></a></li>
+							<li><a href="#" class="jsButtonEditProfile button buttonPrimary">{icon size=16 name='pencil'} <span>{lang}wcf.user.editProfile{/lang}</span></a></li>
 						{/if}
 						
 						{event name='contentHeaderNavigation'}
@@ -274,7 +274,7 @@
 {capture assign='contentInteractionButtons'}
 	{if $__menuSearch}
 		<div class="contentInteractionButton dropdown jsOnly">
-			<a href="#" class="button small dropdownToggle">{icon size=16 name='search' type='solid'} <span>{lang}wcf.user.searchUserContent{/lang}</span></a>
+			<a href="#" class="button small dropdownToggle">{icon size=16 name='magnifying-glass'} <span>{lang}wcf.user.searchUserContent{/lang}</span></a>
 			<ul class="dropdownMenu userProfileButtonMenu" data-menu="search">
 				{@$__menuSearch}
 			</ul>
@@ -282,7 +282,7 @@
 	{/if}
 	{if $__menuManagement}
 		<div class="contentInteractionButton dropdown jsOnly">
-			<a href="#" class="button small dropdownToggle">{icon size=16 name='cog' type='solid'} <span>{lang}wcf.user.profile.management{/lang}</span></a>
+			<a href="#" class="button small dropdownToggle">{icon size=16 name='gear'} <span>{lang}wcf.user.profile.management{/lang}</span></a>
 			<ul class="dropdownMenu userProfileButtonMenu" data-menu="management">
 				{@$__menuManagement}
 			</ul>
diff --git a/com.woltlab.wcf/templates/userInformationButtons.tpl b/com.woltlab.wcf/templates/userInformationButtons.tpl
index 50c5675ec6..184caa2cc4 100644
--- a/com.woltlab.wcf/templates/userInformationButtons.tpl
+++ b/com.woltlab.wcf/templates/userInformationButtons.tpl
@@ -3,7 +3,7 @@
 		<ul class="buttonList iconList">
 			{content}
 				{if $user->homepage && $user->homepage != 'http://'}
-					<li><a class="jsTooltip" title="{lang}wcf.user.option.homepage{/lang}" {anchorAttributes url=$user->homepage appendClassname=false isUgc=true}>{icon size=16 name='house' type='solid'} <span class="invisible">{lang}wcf.user.option.homepage{/lang}</span></a></li>
+					<li><a class="jsTooltip" title="{lang}wcf.user.option.homepage{/lang}" {anchorAttributes url=$user->homepage appendClassname=false isUgc=true}>{icon size=16 name='house'} <span class="invisible">{lang}wcf.user.option.homepage{/lang}</span></a></li>
 				{/if}
 				
 				{if $user->userID != $__wcf->user->userID}
@@ -15,9 +15,9 @@
 				{if $__wcf->user->userID && $user->userID != $__wcf->user->userID}
 					{if !$__wcf->getUserProfileHandler()->isIgnoredByUser($user->userID)}
 						{if $__wcf->getUserProfileHandler()->isFollowing($user->userID)}
-							<li class="jsOnly"><a href="#" data-following="1" data-object-id="{@$user->userID}" class="jsFollowButton jsTooltip" title="{lang}wcf.user.button.unfollow{/lang}">{icon size=16 name='minus' type='solid'} <span class="invisible">{lang}wcf.user.button.unfollow{/lang}</span></a></li>
+							<li class="jsOnly"><a href="#" data-following="1" data-object-id="{@$user->userID}" class="jsFollowButton jsTooltip" title="{lang}wcf.user.button.unfollow{/lang}">{icon size=16 name='minus'} <span class="invisible">{lang}wcf.user.button.unfollow{/lang}</span></a></li>
 						{else}
-							<li class="jsOnly"><a href="#" data-following="0" data-object-id="{@$user->userID}" class="jsFollowButton jsTooltip" title="{lang}wcf.user.button.follow{/lang}">{icon size=16 name='plus' type='solid'} <span class="invisible">{lang}wcf.user.button.follow{/lang}</span></a></li>
+							<li class="jsOnly"><a href="#" data-following="0" data-object-id="{@$user->userID}" class="jsFollowButton jsTooltip" title="{lang}wcf.user.button.follow{/lang}">{icon size=16 name='plus'} <span class="invisible">{lang}wcf.user.button.follow{/lang}</span></a></li>
 						{/if}
 					{/if}
 				{/if}
diff --git a/com.woltlab.wcf/templates/watchedArticleList.tpl b/com.woltlab.wcf/templates/watchedArticleList.tpl
index 589613ef50..44507d6fb6 100644
--- a/com.woltlab.wcf/templates/watchedArticleList.tpl
+++ b/com.woltlab.wcf/templates/watchedArticleList.tpl
@@ -43,7 +43,7 @@
 
 {capture assign='contentInteractionButtons'}
 	{if ARTICLE_ENABLE_VISIT_TRACKING}
-		<a href="#" class="markAllAsReadButton contentInteractionButton button small jsOnly">{icon size=16 name='check' type='solid'} <span>{lang}wcf.global.button.markAllAsRead{/lang}</span></a>
+		<a href="#" class="markAllAsReadButton contentInteractionButton button small jsOnly">{icon size=16 name='check'} <span>{lang}wcf.global.button.markAllAsRead{/lang}</span></a>
 	{/if}
 {/capture}
 
diff --git a/com.woltlab.wcf/templates/worker.tpl b/com.woltlab.wcf/templates/worker.tpl
index bab3e821e2..79b679a7de 100644
--- a/com.woltlab.wcf/templates/worker.tpl
+++ b/com.woltlab.wcf/templates/worker.tpl
@@ -1,7 +1,7 @@
 <div id="workerContainer">
 	<header class="box48 contentHeader">
 		<span class="workerStatusIcon">
-			{icon size=48 name='spinner' type='solid'}
+			{icon size=48 name='spinner'}
 		</span>
 		
 		<div>
diff --git a/wcfsetup/install/files/acp/templates/__bbcodeAttributesFormField.tpl b/wcfsetup/install/files/acp/templates/__bbcodeAttributesFormField.tpl
index 2f21be1f9b..2c35dcf174 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">
-							{icon size=16 name='check' type='solid'} {lang}wcf.global.form.boolean.yes{/lang}
+							{icon size=16 name='check'} {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">
-							{icon size=16 name='times' type='solid'} {lang}wcf.global.form.boolean.no{/lang}
+							{icon size=16 name='xmark'} {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">
-							{icon size=16 name='check' type='solid'} {lang}wcf.global.form.boolean.yes{/lang}
+							{icon size=16 name='check'} {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">
-							{icon size=16 name='times' type='solid'} {lang}wcf.global.form.boolean.no{/lang}
+							{icon size=16 name='xmark'} {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">
-							{icon size=16 name='check' type='solid'} {lang}wcf.global.form.boolean.yes{/lang}
+							{icon size=16 name='check'} {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">
-							{icon size=16 name='times' type='solid'} {lang}wcf.global.form.boolean.no{/lang}
+							{icon size=16 name='xmark'} {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">
-							{icon size=16 name='check' type='solid'} {lang}wcf.global.form.boolean.yes{/lang}
+							{icon size=16 name='check'} {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">
-							{icon size=16 name='times' type='solid'} {lang}wcf.global.form.boolean.no{/lang}
+							{icon size=16 name='xmark'} {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 c3b8421333..e3a962cb96 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">{icon size=16 name='check' type='solid'} {lang}wcf.global.form.boolean.yes{/lang}</label>
+		<label for="{@$field->getPrefixedId()}" class="green">{icon size=16 name='check'} {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">{icon size=16 name='times' type='solid'} {lang}wcf.global.form.boolean.no{/lang}</label>
+		<label for="{@$field->getPrefixedId()}_no" class="red">{icon size=16 name='xmark'} {lang}wcf.global.form.boolean.no{/lang}</label>
 	</li>
 </ol>
diff --git a/wcfsetup/install/files/acp/templates/__optionRewriteTest.tpl b/wcfsetup/install/files/acp/templates/__optionRewriteTest.tpl
index 1708839ef2..04043a6d22 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">
-			{icon size=24 name='spinner' type='solid'}
+			{icon size=24 name='spinner'}
 			<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/aclSimple.tpl b/wcfsetup/install/files/acp/templates/aclSimple.tpl
index 8c49e69801..2343ecee46 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">{icon size=16 name='check' type='solid'} {lang}wcf.acp.option.type.boolean.yes{/lang}</label>
+					<label for="{@$__aclSimplePrefix}aclAllowAll" class="green">{icon size=16 name='check'} {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">{icon size=16 name='times' type='solid'} {lang}wcf.acp.option.type.boolean.no{/lang}</label>
+					<label for="{@$__aclSimplePrefix}aclAllowAll_no" class="red">{icon size=16 name='xmark'} {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">{icon size=16 name='check' type='solid'} {lang}wcf.acp.option.type.boolean.yes{/lang}</label>
+						<label for="{@$__aclSimplePrefix}invertPermissions" class="green">{icon size=16 name='check'} {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">{icon size=16 name='times' type='solid'} {lang}wcf.acp.option.type.boolean.no{/lang}</label>
+						<label for="{@$__aclSimplePrefix}invertPermissions_no" class="red">{icon size=16 name='xmark'} {lang}wcf.acp.option.type.boolean.no{/lang}</label>
 					</li>
 				</ol>
 				<small>{lang}wcf.acl.access.invertPermissions.description{/lang}</small>
diff --git a/wcfsetup/install/files/acp/templates/acpSessionLog.tpl b/wcfsetup/install/files/acp/templates/acpSessionLog.tpl
index 3b4706b0e4..bb45563ca8 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">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.sessionLog.list{/lang}</span></a></li>
+			<li><a href="{link controller='ACPSessionLogList'}{/link}" class="button">{icon size=16 name='list'} <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">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.sessionLog.list{/lang}</span></a></li>
+				<li><a href="{link controller='ACPSessionLogList'}{/link}" class="button">{icon size=16 name='list'} <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 4985b1d15a..400b67b5d6 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">{icon size=16 name='list' type='solid'} <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'} <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 61d85f091b..4e2c149861 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">{icon size=16 name='plus' type='solid'} <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'} <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">{icon size=16 name='pencil' type='solid'}</a>
+							<a href="{link controller='AdEdit' object=$ad}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil'}</a>
 							{objectAction action="delete" objectTitle=$ad->getTitle()}
 							
 							{event name='itemButtons'}
@@ -65,7 +65,7 @@
 		
 		<nav class="contentFooterNavigation">
 			<ul>
-				<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>
+				<li><a href="{link controller='AdAdd'}{/link}" class="button">{icon size=16 name='plus'} <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 b4c4ce3d48..37a8076257 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}>{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>
+						<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'} <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='xmark'} <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='xmark'} <span>{lang}wcf.global.button.trash{/lang}</span></a></li>
 					{/if}
 					{if $languages|count > 1 || $article->isMultilingual}
-						<li><a href="#" class="button jsButtonToggleI18n">{icon size=16 name='flag' type='solid'} <span>{lang}wcf.acp.article.button.toggleI18n{/lang}</span></a></li>
+						<li><a href="#" class="button jsButtonToggleI18n">{icon size=16 name='flag'} <span>{lang}wcf.acp.article.button.toggleI18n{/lang}</span></a></li>
 					{/if}
-					<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>
+					<li><a href="{$article->getLink()}" class="button">{icon size=16 name='magnifying-glass'} <span>{lang}wcf.acp.article.button.viewArticle{/lang}</span></a></li>
 				{/if}
-				<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>
+				<li><a href="{link controller='ArticleList'}{/link}" class="button">{icon size=16 name='list'} <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 b7b71ff128..7e2ed5afb6 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">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.article.add{/lang}</span></a></li>
+				<li><a href="#" class="button jsButtonArticleAdd">{icon size=16 name='plus'} <span>{lang}wcf.acp.article.add{/lang}</span></a></li>
 			{else}
-				<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>
+				<li><a href="{link controller='ArticleAdd'}{/link}" class="button">{icon size=16 name='plus'} <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">{icon size=16 name='pencil' type='solid'}</a>
+							<a href="{link controller='ArticleEdit' id=$article->articleID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil'}</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}>{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>
+								<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'}</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='xmark'}</a>
+								<a href="#" class="jsButtonTrash jsTooltip" title="{lang}wcf.global.button.trash{/lang}" data-confirm-message-html="{lang __encode=true}wcf.acp.article.trash.confirmMessage{/lang}"{if $article->isDeleted} style="display: none"{/if}>{icon size=16 name='xmark'}</a>
 							{else}
 								<span class="icon icon16 fa-times disabled" title="{lang}wcf.global.button.delete{/lang}"></span>
 							{/if}
 							
-							<a href="{$article->getLink()}" title="{lang}wcf.acp.article.button.viewArticle{/lang}" class="jsTooltip">{icon size=16 name='search' type='solid'}</a>
+							<a href="{$article->getLink()}" title="{lang}wcf.acp.article.button.viewArticle{/lang}" class="jsTooltip">{icon size=16 name='magnifying-glass'}</a>
 							
 							{event name='rowButtons'}
 						</td>
@@ -220,9 +220,9 @@
 		<nav class="contentFooterNavigation">
 			<ul>
 				{if $availableLanguages|count > 1}
-					<li><a href="#" class="button jsButtonArticleAdd">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.article.add{/lang}</span></a></li>
+					<li><a href="#" class="button jsButtonArticleAdd">{icon size=16 name='plus'} <span>{lang}wcf.acp.article.add{/lang}</span></a></li>
 				{else}
-					<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>
+					<li><a href="{link controller='ArticleAdd'}{/link}" class="button">{icon size=16 name='plus'} <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 9a998e25f4..50a88f127a 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">{icon size=16 name='list' type='solid'} <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'} <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">{icon size=16 name='search' type='solid'}</a>
+						<a href="#" class="inputSuffix button jsButtonSearchWysiwygIcon">{icon size=16 name='magnifying-glass'}</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 8789822b2a..c5dfd1b27b 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">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.bbcode.add{/lang}</span></a></li>
+			<li><a href="{link controller='BBCodeAdd'}{/link}" class="button">{icon size=16 name='plus'} <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">{icon size=16 name='pencil' type='solid'}</a>
+							<a href="{link controller='BBCodeEdit' object=$bbcode}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil'}</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">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.bbcode.add{/lang}</span></a></li>
+				<li><a href="{link controller='BBCodeAdd'}{/link}" class="button">{icon size=16 name='plus'} <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 2c0b7ff6ac..944d4737d3 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">{icon size=16 name='list' type='solid'} <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'} <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 ed12dee77b..576abdd511 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">{icon size=16 name='plus' type='solid'} <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'} <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">{icon size=16 name='pencil' type='solid'}</a>
+							<a href="{link controller='BBCodeMediaProviderEdit' object=$mediaProvider}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil'}</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">{icon size=16 name='plus' type='solid'} <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'} <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 db6b9358a8..707f696ef4 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">{icon size=16 name='check' type='solid'} {lang}wcf.acp.option.type.boolean.yes{/lang}</label>
+		<label for="{$option->optionName}" class="green">{icon size=16 name='check'} {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">{icon size=16 name='times' type='solid'} {lang}wcf.acp.option.type.boolean.no{/lang}</label>
+		<label for="{$option->optionName}_no" class="red">{icon size=16 name='xmark'} {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 d66a1bfff9..de8173c260 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">{icon size=16 name='check' type='solid'} {lang}wcf.acp.option.type.boolean.yes{/lang}</label>
+		<label for="{$option->optionName}" class="green">{icon size=16 name='check'} {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">{icon size=16 name='times' type='solid'} {lang}wcf.acp.option.type.boolean.no{/lang}</label>
+		<label for="{$option->optionName}_no" class="red">{icon size=16 name='xmark'} {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 ebdde5f3f6..28e66f109e 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">{icon size=16 name='copy' type='solid'} {lang}wcf.acp.box.button.copyBox{/lang}</a></li>
+				<li><a href="#" class="button jsButtonCopyBox">{icon size=16 name='copy'} {lang}wcf.acp.box.button.copyBox{/lang}</a></li>
 			{/if}
-			<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>
+			<li><a href="{link controller='BoxList'}{/link}" class="button">{icon size=16 name='list'} <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}">{icon size=16 name='search' type='solid'}</a>
+								<a href="#" id="searchLinkPageObjectID" class="inputSuffix button jsTooltip" title="{lang}wcf.page.pageObjectID.search{/lang}">{icon size=16 name='magnifying-glass'}</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 99d6feeac3..7c71473dd6 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">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.box.add{/lang}</span></a></li>
+			<li><a href="#" class="button jsButtonBoxAdd">{icon size=16 name='plus'} <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">{icon size=16 name='pencil' type='solid'}</a>
+							<a href="{link controller='BoxEdit' id=$box->boxID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil'}</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">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.box.add{/lang}</span></a></li>
+				<li><a href="#" class="button jsButtonBoxAdd">{icon size=16 name='plus'} <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 e160054034..cd6d929c85 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">{icon size=16 name='times' type='solid'} <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='xmark'} <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}">{icon size=16 name='chevron-right' type='solid'}</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'}</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">{icon size=16 name='times' type='solid'} <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='xmark'} <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 25fd70dc1c..f26063424c 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">{icon size=16 name='list' type='solid'} <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'} <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 00010ab4a4..e19a644cc1 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">{icon size=16 name='plus' type='solid'} <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'} <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">{icon size=16 name='pencil' type='solid'}</a>
+							<a href="{link controller='CaptchaQuestionEdit' id=$question->questionID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil'}</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">{icon size=16 name='plus' type='solid'} <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'} <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 35dd29234d..c3389af0d7 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">{icon size=16 name='sort' type='solid'} <span>{@$objectType->getProcessor()->getLanguageVariable('button.choose')}</span></a>
+							<a class="button dropdownToggle">{icon size=16 name='sort'} <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">{icon size=16 name='list' type='solid'} <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'} <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 eb6553f451..5a168bb126 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">{icon size=16 name='plus' type='solid'} <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'} <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">{icon size=16 name='pencil' type='solid'}</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'}</a>
 								{/if}
 								
 								{if $objectType->getProcessor()->canDeleteCategory()}
diff --git a/wcfsetup/install/files/acp/templates/codeMetaCode.tpl b/wcfsetup/install/files/acp/templates/codeMetaCode.tpl
index ec8ed023d3..6cb38d173f 100644
--- a/wcfsetup/install/files/acp/templates/codeMetaCode.tpl
+++ b/wcfsetup/install/files/acp/templates/codeMetaCode.tpl
@@ -4,7 +4,7 @@
 		
 		{if !$isAmp && $lines > 10}
 			<span class="toggleButton jsTooltip pointer" title="{lang}wcf.bbcode.button.showAll{/lang}" data-title-collapse="{lang}wcf.bbcode.button.collapse{/lang}" data-title-expand="{lang}wcf.bbcode.button.showAll{/lang}" role="button" tabindex="0">
-				{icon size=24 name='up-right-and-down-left-from-center' type='solid'}
+				{icon size=24 name='up-right-and-down-left-from-center'}
 			</span>
 		{/if}
 	</div>
diff --git a/wcfsetup/install/files/acp/templates/contactOptionAdd.tpl b/wcfsetup/install/files/acp/templates/contactOptionAdd.tpl
index d12d75b7bd..8c326c09ba 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">{icon size=16 name='list' type='solid'} <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'} <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 86a96c0c6e..5e3886f4ba 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">{icon size=16 name='list' type='solid'} <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'} <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 f424184a8e..80d0d14e7c 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">{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>
+			<li><a href="{link controller='ContactRecipientAdd'}{/link}" class="button">{icon size=16 name='plus'} <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'} <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">{icon size=16 name='pencil' type='solid'}</a>
+							<a href="{link controller='ContactOptionEdit' id=$option->optionID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil'}</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 c3fa049fdd..c740eb1143 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">{icon size=16 name='list' type='solid'} <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'} <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 ce58a82740..ccd4978b73 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">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.cronjob.add{/lang}</span></a></li>
+			<li><a href="{link controller='CronjobAdd'}{/link}" class="button">{icon size=16 name='plus'} <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">{icon size=16 name='pencil' type='solid'}</a>
+									<a href="{link controller='CronjobEdit' id=$cronjob->cronjobID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil'}</a>
 								{else}
 									<span class="icon icon16 fa-pencil disabled" title="{lang}wcf.global.button.edit{/lang}"></span>
 								{/if}
@@ -114,7 +114,7 @@
 	
 	<nav class="contentFooterNavigation">
 		<ul>
-			<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>
+			<li><a href="{link controller='CronjobAdd'}{/link}" class="button">{icon size=16 name='plus'} <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 f22b9a27f5..9399456831 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">{icon size=16 name='times' type='solid'} <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='xmark'} <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">{icon size=16 name='times' type='solid'} <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='xmark'} <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 cac5f22838..861a965de4 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">{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>
+						<li><a href="#" id="clearExisingMissingLanguageItemLog" class="button">{icon size=16 name='xmark'} <span>{lang}wcf.acp.devtools.missingLanguageItem.clearExistingLog{/lang}</span></a></li>
+						<li><a href="#" id="clearMissingLanguageItemLog" class="button">{icon size=16 name='xmark'} <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 80d5a0b7e0..c7ce26b105 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">{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>
+				<li><a href="{link controller='DevtoolsProjectSync' id=$formObject->getObjectID()}{/link}" class="button">{icon size=16 name='arrows-rotate'} <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'} <span>{lang}wcf.acp.devtools.project.pips{/lang}</span></a></li>
 			{/if}
-			<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>
+			<li><a href="{link controller='DevtoolsProjectList'}{/link}" class="button">{icon size=16 name='list'} <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 2df1917cee..faefdf7a13 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">{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>
+			<li><a href="#" class="button jsDevtoolsProjectQuickSetupButton">{icon size=16 name='magnifying-glass'} <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'} <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">{icon size=16 name='pencil' type='solid'}</a>
+								<a href="{link controller='DevtoolsProjectEdit' id=$object->getObjectID()}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil'}</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">{icon size=16 name='plus' type='solid'} <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'} <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 24c695af23..f2aa37f27c 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">{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>
+			<li><a href="{link controller='DevtoolsProjectPipEntryList' id=$project->projectID pip=$pip entryType=$entryType}{/link}" class="button">{icon size=16 name='list'} <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'} <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 59b85cd2be..05fc177349 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">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.devtools.project.pip.list{/lang}</span></a>
+				<a class="button dropdownToggle">{icon size=16 name='list'} <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">{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>
+			<li><a href="{link controller='DevtoolsProjectPipEntryAdd' id=$project->projectID pip=$pip entryType=$entryType}{/link}" class="button">{icon size=16 name='plus'} <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'} <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">{icon size=16 name='pencil' type='solid'}</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'}</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">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.devtools.project.pip.list{/lang}</span></a>
+					<a class="button dropdownToggle">{icon size=16 name='list'} <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">{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>
+				<li><a href="{link controller='DevtoolsProjectPipEntryAdd' id=$project->projectID pip=$pip entryType=$entryType}{/link}" class="button">{icon size=16 name='plus'} <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'} <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 faa2b6e05a..f5ec611422 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">{icon size=16 name='arrows-rotate' type='solid'} <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'} <span>{lang}wcf.acp.devtools.project.sync{/lang}</span></a></li>
 			{/if}
-			<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>
+			<li><a href="{link controller='DevtoolsProjectEdit' id=$project->getObjectID()}{/link}" class="button">{icon size=16 name='pencil'} <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'} <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">{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>
+									<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'}</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'}</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">{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>
+									<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'}</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'}</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 f591724188..5742f52e5d 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">{icon size=16 name='list' type='solid'} <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'} <span>{lang}wcf.acp.devtools.project.pips{/lang}</span></a></li>
 			{/if}
-			<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>
+			<li><a href="{link controller='DevtoolsProjectEdit' id=$object->getObjectID()}{/link}" class="button">{icon size=16 name='pencil'} <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'} <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 8adb6ee591..ee67926b0a 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">{icon size=16 name='house' type='solid'} <span>{lang}wcf.global.acp{/lang}</span></a></li>
+					<li><a href="{link}{/link}" class="button">{icon size=16 name='house'} <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 c7d85d608d..528bc4814f 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">{icon size=16 name='list' type='solid'} <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'} <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 adc3927f23..cc3cc40a0a 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">{icon size=16 name='list' type='solid'} <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'} <span>{lang}wcf.acp.label.list{/lang}</span></a></li>
 			{/if}
-			<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>
+			<li><a href="{link controller='LabelGroupList'}{/link}" class="button">{icon size=16 name='list'} <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 ae9d86711c..16d779d6dd 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">{icon size=16 name='plus' type='solid'} <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'} <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">{icon size=16 name='pencil' type='solid'}</a>
+							<a href="{link controller='LabelGroupEdit' object=$group}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil'}</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">{icon size=16 name='plus' type='solid'} <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'} <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 602f17c96d..8eb89d55b6 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">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.label.add{/lang}</span></a></li>
+			<li><a href="{link controller='LabelAdd'}{/link}" class="button">{icon size=16 name='plus'} <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">{icon size=16 name='pencil' type='solid'}</a>
+							<a href="{link controller='LabelEdit' object=$label}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil'}</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">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.label.add{/lang}</span></a></li>
+				<li><a href="{link controller='LabelAdd'}{/link}" class="button">{icon size=16 name='plus'} <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 3f4bc239f2..ef0cbcd1f6 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">{icon size=16 name='list' type='solid'} <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'} <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 572b8e84dd..8466333602 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">{icon size=16 name='list' type='solid'} <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'} <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 f9bde11199..c222c0510a 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">{icon size=16 name='list' type='solid'} <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'} <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 2801c1fdb4..c4b0bd49c2 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">{icon size=16 name='list' type='solid'} <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'} <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 75d47426de..de6916f25f 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">{icon size=16 name='plus' type='solid'} <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'} <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 bffd3a9f5b..0ad3713b8a 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">{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>
+			<li><a href="{link controller='LanguageAdd'}{/link}" class="button">{icon size=16 name='plus'} <span>{lang}wcf.acp.language.add{/lang}</span></a></li>
+			<li><a href="{link controller='LanguageImport'}{/link}" class="button">{icon size=16 name='upload'} <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">{icon size=16 name='download' type='solid'}</a>
+							<a href="{link controller='LanguageExport' id=$language->languageID}{/link}" title="{lang}wcf.acp.language.export{/lang}" class="jsTooltip">{icon size=16 name='download'}</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">{icon size=16 name='pencil' type='solid'}</a>
+							<a href="{link controller='LanguageEdit' id=$language->languageID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil'}</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">{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>
+				<li><a href="{link controller='LanguageAdd'}{/link}" class="button">{icon size=16 name='plus'} <span>{lang}wcf.acp.language.add{/lang}</span></a></li>
+				<li><a href="{link controller='LanguageImport'}{/link}" class="button">{icon size=16 name='upload'} <span>{lang}wcf.acp.language.import{/lang}</span></a></li>
 				
 				{event name='contentFooterNavigation'}
 			</ul>
diff --git a/wcfsetup/install/files/acp/templates/mediaList.tpl b/wcfsetup/install/files/acp/templates/mediaList.tpl
index f00eafddd5..edf871dae9 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">
-							{icon size=48 name='file' type='solid'}
+							{icon size=48 name='file'}
 							
 							<div>
 								<p></p>
diff --git a/wcfsetup/install/files/acp/templates/menuAdd.tpl b/wcfsetup/install/files/acp/templates/menuAdd.tpl
index 7b5cefb73d..8190396185 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">{icon size=16 name='list' type='solid'} <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'} <span>{lang}wcf.acp.menu.item.list{/lang}</span></a></li>
 			{/if}
-			<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>
+			<li><a href="{link controller='MenuList'}{/link}" class="button">{icon size=16 name='list'} <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 8ee16c4b49..33a8ca8b51 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">{icon size=16 name='sort' type='solid'} <span>{lang}wcf.acp.menu.item.button.choose{/lang}</span></a>
+					<a class="button dropdownToggle">{icon size=16 name='sort'} <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">{icon size=16 name='list' type='solid'} <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'} <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}">{icon size=16 name='search' type='solid'}</a>
+					<a href="#" id="searchPageObjectID" class="inputSuffix button jsTooltip" title="{lang}wcf.page.pageObjectID.search{/lang}">{icon size=16 name='magnifying-glass'}</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 34c4e6fcae..085b6ee629 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">{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>
+			<li><a href="{link controller='MenuEdit' id=$menuID}{/link}" class="button">{icon size=16 name='pencil'} <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'} <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}">{icon size=16 name='pencil' type='solid'}</a>
+								<a href="{link controller='MenuItemEdit' id=$menuItemNode->itemID}{/link}" class="jsTooltip" title="{lang}wcf.global.button.edit{/lang}">{icon size=16 name='pencil'}</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 902a879b24..5e4c2124bd 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">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.menu.add{/lang}</span></a></li>
+			<li><a href="{link controller='MenuAdd'}{/link}" class="button">{icon size=16 name='plus'} <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">{icon size=16 name='pencil' type='solid'}</a>
+							<a href="{link controller='MenuEdit' id=$menu->menuID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil'}</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">{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>
+							<a href="{link controller='MenuItemList' id=$menu->menuID}{/link}" title="{lang}wcf.acp.menu.item.list{/lang}" class="jsTooltip">{icon size=16 name='list'}</a>
+							<a href="{link controller='MenuItemAdd'}menuID={@$menu->menuID}{/link}" title="{lang}wcf.acp.menu.item.add{/lang}" class="jsTooltip">{icon size=16 name='plus'}</a>
 							
 							{event name='rowButtons'}
 						</td>
@@ -72,7 +72,7 @@
 		
 		<nav class="contentFooterNavigation">
 			<ul>
-				<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>
+				<li><a href="{link controller='MenuAdd'}{/link}" class="button">{icon size=16 name='plus'} <span>{lang}wcf.acp.menu.add{/lang}</span></a></li>
 				
 				{event name='contentFooterNavigation'}
 			</ul>
diff --git a/wcfsetup/install/files/acp/templates/noticeAdd.tpl b/wcfsetup/install/files/acp/templates/noticeAdd.tpl
index 4b0f8965d1..6bcebe4702 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">{icon size=16 name='list' type='solid'} <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'} <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 59a83aa7f3..92d05ea858 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">{icon size=16 name='plus' type='solid'} <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'} <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">{icon size=16 name='pencil' type='solid'}</a>
+							<a href="{link controller='NoticeEdit' object=$notice}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil'}</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">{icon size=16 name='plus' type='solid'} <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'} <span>{lang}wcf.acp.menu.link.notice.add{/lang}</span></a></li>
 				
 				{event name='contentFooterNavigation'}
 			</ul>
diff --git a/wcfsetup/install/files/acp/templates/package.tpl b/wcfsetup/install/files/acp/templates/package.tpl
index 66ccf95ca4..446e009cb9 100644
--- a/wcfsetup/install/files/acp/templates/package.tpl
+++ b/wcfsetup/install/files/acp/templates/package.tpl
@@ -20,7 +20,7 @@
 			<ul>
 				{content}
 					{if $package->canUninstall()}
-						<li><button class="button jsUninstallButton" data-object-id="{@$package->packageID}" data-confirm-message="{lang __encode=true}wcf.acp.package.uninstallation.confirm{/lang}" data-is-required="{if $package->isRequired()}true{else}false{/if}" data-is-application="{if $package->isApplication}true{else}false{/if}">{icon size=16 name='times' type='solid'} <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='xmark'} <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">{icon size=16 name='list' type='solid'} <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'} <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 210fd3f612..030c808e68 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">{icon size=16 name='list' type='solid'} <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'} <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 9c7d867c7b..21cffdd352 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">{icon size=16 name='arrows-rotate' type='solid'} <span>{lang}wcf.acp.package.searchForUpdates{/lang}</span></a></li>
+						<li><a href="#" class="button jsButtonSearchForUpdates">{icon size=16 name='arrows-rotate'} <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">{icon size=16 name='plus' type='solid'} <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'} <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">{icon size=16 name='plus' type='solid'} <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'} <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 fed487f55e..e3fbf881cc 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}">{icon size=24 name='plus' type='solid'}</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'}</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 b8151ea9f2..2852fa637c 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">{icon size=16 name='upload' type='solid'} <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'} <span>{lang}wcf.acp.package.upload{/lang}</span></a></li>
 			{/if}
-			<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>
+			<li><a href="{link controller='PackageList'}{/link}" class="button">{icon size=16 name='list'} <span>{lang}wcf.acp.menu.link.package.list{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
@@ -80,12 +80,12 @@
 		</div>
 		
 		<div class="packageSearchStatus packageSearchStatusRefreshDatabase">
-			{icon size=64 name='spinner' type='solid'}
+			{icon size=64 name='spinner'}
 			<span class="packageSearchStatusLabel">{lang}wcf.acp.package.search.status.refreshDatabase{/lang}</span>
 		</div>
 		
 		<div class="packageSearchStatus packageSearchStatusLoading">
-			{icon size=64 name='spinner' type='solid'}
+			{icon size=64 name='spinner'}
 			<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 713435db4a..34bc1c1636 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">{icon size=16 name='list' type='solid'} <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'} <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 21a304654c..8f1f561d19 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">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.updateServer.add{/lang}</span></a></li>
+			<li><a href="{link controller='PackageUpdateServerAdd'}{/link}" class="button">{icon size=16 name='plus'} <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">{icon size=16 name='pencil' type='solid'}</a>
+							<a href="{link controller='PackageUpdateServerEdit' id=$updateServer->packageUpdateServerID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil'}</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">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.updateServer.add{/lang}</span></a></li>
+				<li><a href="{link controller='PackageUpdateServerAdd'}{/link}" class="button">{icon size=16 name='plus'} <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 bc459c9ba1..2af46722be 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">{icon size=16 name='copy' type='solid'} {lang}wcf.acp.page.button.copyPage{/lang}</a></li>
+					<li><a href="#" class="button jsButtonCopyPage">{icon size=16 name='copy'} {lang}wcf.acp.page.button.copyPage{/lang}</a></li>
 				{/if}
 
 				{if !$page->requireObjectID}
-					<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>
+					<li><a href="{$page->getLink()}" class="button">{icon size=16 name='magnifying-glass'} <span>{lang}wcf.acp.page.button.viewPage{/lang}</span></a></li>
 				{/if}
 
-				<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>
+				<li><a href="{link controller='PageBoxOrder' id=$page->pageID}{/link}" class="button">{icon size=16 name='arrow-down-short-wide'} <span>{lang}wcf.acp.page.button.boxOrder{/lang}</span></a></li>
 			{/if}
-			<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>
+			<li><a href="{link controller='PageList'}{/link}" class="button">{icon size=16 name='list'} <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 b092dd684c..4877844704 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">{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>
+			{if $hasCustomShowOrder}<li><a href="#" class="button jsButtonCustomShowOrder">{icon size=16 name='xmark'} <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'} <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 11e17b01e9..3285cd076e 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}">{icon size=32 name='house' type='solid'}</a>
+					<a href="{link forceFrontend=true}{/link}" class="jsTooltip" title="{lang}wcf.global.jumpToPage{/lang}">{icon size=32 name='house'}</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}">{icon size=32 name='arrows-rotate' type='solid'} <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'} <span class="badge badgeUpdate">{#$__wcf->getAvailableUpdates()}</span></a>
 					</li>
 				{/if}
 			{/if}
 			
 			<li id="woltlab" class="dropdown">
-				<a href="#" class="dropdownToggle jsTooltip" title="WoltLab&reg;">{icon size=32 name='info' type='solid'}</a>
+				<a href="#" class="dropdownToggle jsTooltip" title="WoltLab&reg;">{icon size=32 name='info'}</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 31e9f43adf..8306cef53e 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">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.page.add{/lang}</span></a></li>
+			<li><a href="#" class="button jsButtonPageAdd">{icon size=16 name='plus'} <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">{icon size=16 name='pencil' type='solid'}</a>
+							<a href="{link controller='PageEdit' id=$page->pageID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil'}</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">{icon size=16 name='search' type='solid'}</a>
+								<a href="{$page->getLink()}" title="{lang}wcf.acp.page.button.viewPage{/lang}" class="jsTooltip">{icon size=16 name='magnifying-glass'}</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">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.page.add{/lang}</span></a></li>
+				<li><a href="#" class="button jsButtonPageAdd">{icon size=16 name='plus'} <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 91a1549647..5288e61bd2 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">{icon size=16 name='list' type='solid'} <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'} <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 6fd4b47541..5341f5831c 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">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.paidSubscription.add{/lang}</span></a></li>
+			<li><a href="{link controller='PaidSubscriptionAdd'}{/link}" class="button">{icon size=16 name='plus'} <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">{icon size=16 name='pencil' type='solid'}</a>
+							<a href="{link controller='PaidSubscriptionEdit' id=$subscription->subscriptionID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil'}</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">{icon size=16 name='plus' type='solid'}</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'}</a>
 							
 							{event name='itemButtons'}
 						</td>
@@ -68,7 +68,7 @@
 		
 		<nav class="contentFooterNavigation">
 			<ul>
-				<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>
+				<li><a href="{link controller='PaidSubscriptionAdd'}{/link}" class="button">{icon size=16 name='plus'} <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 065df82e7c..ced6a5ee8f 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">{icon size=16 name='list' type='solid'} <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'} <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">{icon size=16 name='list' type='solid'} <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'} <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 ccd65f46ca..7ed36b2759 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">{icon size=16 name='list' type='solid'} <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'} <span>{lang}wcf.acp.menu.link.paidSubscription.list{/lang}</span></a></li>
 			{else}
-				<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>
+				<li><a href="{link controller='PaidSubscriptionUserList'}{/link}" class="button">{icon size=16 name='list'} <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 d246193146..0e7994da66 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">{icon size=16 name='pencil' type='solid'}</a>
+								<a href="{link controller='PaidSubscriptionUserEdit' id=$subscriptionUser->subscriptionUserID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil'}</a>
 							{else}
 								<span class="icon icon16 fa-pencil disabled"></span>
 							{/if}
diff --git a/wcfsetup/install/files/acp/templates/reactionTypeAdd.tpl b/wcfsetup/install/files/acp/templates/reactionTypeAdd.tpl
index e301bace68..4165b1b51e 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">{icon size=16 name='list' type='solid'} <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'} <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 af2b5e2557..90d87c7544 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">{icon size=16 name='plus' type='solid'} <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'} <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 fe1f4c150a..dec1a63cef 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">{icon size=16 name='down-long' type='solid'} <span>{lang}wcf.acp.rebuildData.rebuildAll{/lang}</span></a></li>
+			<li><a href="#" class="button jsRebuildAll">{icon size=16 name='down-long'} <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 1df2153bee..26822aba24 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">{icon size=16 name='list' type='solid'} <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'} <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 d21b9b4050..9f18ece9df 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">{icon size=16 name='arrows-rotate' type='solid'} <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'} <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">{icon size=16 name='pencil' type='solid'}</a>
+							<a href="{link controller="SitemapEdit"}objectType={$object->objectType}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil'}</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 49fe81def0..2b46161efc 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">{icon size=16 name='list' type='solid'} <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'} <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 870e989f8c..2651eb0ac3 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">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.smiley.add{/lang}</span></a></li>
+			<li><a href="{link controller='SmileyAdd'}{/link}" class="button">{icon size=16 name='plus'} <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 b068479604..969293fc55 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">{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>
+				<li><a href="{link controller='StyleExport' id=$style->styleID}{/link}" class="button">{icon size=16 name='download'} <span>{lang}wcf.acp.style.exportStyle{/lang}</span></a></li>
+				<li><a class="jsCopyStyle button">{icon size=16 name='copy'} <span>{lang}wcf.acp.style.copyStyle{/lang}</span></a></li>
 			{/if}
 			
-			<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>
+			<li><a href="{link controller='StyleList'}{/link}" class="button">{icon size=16 name='list'} <span>{lang}wcf.acp.menu.link.style.list{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
@@ -698,14 +698,14 @@
 										<div id="spEditorToolbar" data-region="wcfEditorButton">
 											<ul class="redactor-toolbar">
 												<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>
+												<li><a>{icon size=16 name='rotate-left'}</a></li>
+												<li><a>{icon size=16 name='arrow-rotate-right'}</a></li>
+												<li><a>{icon size=16 name='up-right-and-down-left-from-center'}</a></li>
+												<li class="redactor-toolbar-separator"><a>{icon size=16 name='heading'}</a></li>
+												<li class="redactor-toolbar-separator"><a>{icon size=16 name='bold'}</a></li>
+												<li><a class="dropact">{icon size=16 name='italic'}</a></li>
+												<li><a>{icon size=16 name='underline'}</a></li>
+												<li><a>{icon size=16 name='strikethrough'}</a></li>
 											</ul>
 										</div>
 										<div id="spEditorContent">
@@ -742,7 +742,7 @@
 										<div class="userMenuHeader">
 											<div class="userMenuTitle">Lorem Ipsum</div>
 											<div class="userMenuButtons">
-												<a class="userMenuButton">{icon size=24 name='cog' type='solid'}</a>
+												<a class="userMenuButton">{icon size=24 name='gear'}</a>
 											</div>
 										</div>
 										<div class="userMenuContent">
@@ -760,7 +760,7 @@
 												</div>
 												<div class="userMenuItemUnread">
 													<a class="userMenuItemMarkAsRead">
-														{icon size=24 name='check' type='solid'}
+														{icon size=24 name='check'}
 													</a>
 												</div>
 											</div>
diff --git a/wcfsetup/install/files/acp/templates/styleExport.tpl b/wcfsetup/install/files/acp/templates/styleExport.tpl
index 672eb83738..a7a38572f4 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">{icon size=16 name='list' type='solid'} <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'} <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 f2aa3222a9..82119e7146 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">{icon size=16 name='list' type='solid'} <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'} <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 99a5351440..3fcde72809 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">{icon size=16 name='list' type='solid'} <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'} <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 84d9e1cc0e..31dd4f744e 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">{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>
+			<li><a href="{link controller='StyleAdd'}{/link}" class="button">{icon size=16 name='plus'} <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'} <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">{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>
+								<li><a href="{link controller='StyleEdit' id=$style->styleID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil'} <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'} <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">{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>
+									<li><a href="#" title="{lang}wcf.acp.style.button.setAsDefault{/lang}" class="jsSetAsDefault jsTooltip">{icon size=16 name='circle-check'} <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='xmark'} <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">{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>
+			<li><a href="{link controller='StyleAdd'}{/link}" class="button">{icon size=16 name='plus'} <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'} <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 2f07c3f922..d146d8530f 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">{icon size=16 name='list' type='solid'} <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'} <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 967c7856fb..031cadb70c 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">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.tag.add{/lang}</span></a></li>
+			<li><a href="{link controller='TagAdd'}{/link}" class="button">{icon size=16 name='plus'} <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">{icon size=16 name='pencil' type='solid'}</a>
+							<a href="{link controller='TagEdit' object=$tag}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil'}</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">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.tag.add{/lang}</span></a></li>
+				<li><a href="{link controller='TagAdd'}{/link}" class="button">{icon size=16 name='plus'} <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 4bdd590917..3f8101159a 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">{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>
+			{if $action == 'edit'}<li><a href="{link controller='TemplateDiff' id=$template->templateID}{/link}" class="button">{icon size=16 name='right-left'} <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'} <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 77240419b6..c1002b5106 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">{icon size=16 name='pencil' type='solid'} <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'} <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">{icon size=16 name='pencil' type='solid'} <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'} <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 0ebd01a227..6a2881d6d3 100644
--- a/wcfsetup/install/files/acp/templates/templateGroupAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/templateGroupAdd.tpl
@@ -25,7 +25,7 @@
 	<nav class="contentHeaderNavigation">
 		<ul>
 			{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>
+			<li><a href="{link controller='TemplateGroupList'}{/link}" class="button">{icon size=16 name='list'} <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 a3f0433ccc..76a91970d6 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">{icon size=16 name='plus' type='solid'} <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'} <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">{icon size=16 name='pencil' type='solid'}</a>
+								<a href="{link controller='TemplateGroupEdit' id=$templateGroup->templateGroupID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil'}</a>
 							{/if}
 							
-							<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>
+							<a href="{link controller='TemplateList' templateGroupID=$templateGroup->templateGroupID}{/link}" title="{lang}wcf.acp.template.list{/lang}" class="jsTooltip">{icon size=16 name='list'}</a>
 							
 							{if $templateGroup->isImmutable()}
 								<span class="icon icon16 fa-times disabled" title="{lang}wcf.global.button.delete{/lang}"></span>
@@ -86,7 +86,7 @@
 		
 		<nav class="contentFooterNavigation">
 			<ul>
-				<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>
+				<li><a href="{link controller='TemplateGroupAdd'}{/link}" class="button">{icon size=16 name='plus'} <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 f205114101..79695a890d 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">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.template.add{/lang}</span></a></li>
+			<li><a href="{link controller='TemplateAdd'}{/link}" class="button">{icon size=16 name='plus'} <span>{lang}wcf.acp.template.add{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
@@ -98,8 +98,8 @@
 								<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">{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>
+									<a href="{link controller='TemplateDiff' id=$template->templateID}{/link}" title="{lang}wcf.acp.template.diff{/lang}" class="jsTooltip">{icon size=16 name='right-left'}</a>
+									<a href="{link controller='TemplateEdit' id=$template->templateID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil'}</a>
 									{objectAction action="delete" objectTitle=$template->templateName}
 								{else}
 									<span class="icon icon16 fa-exchange disabled" title="{lang}wcf.acp.template.diff{/lang}"></span>
@@ -130,7 +130,7 @@
 		
 		<nav class="contentFooterNavigation">
 			<ul>
-				<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>
+				<li><a href="{link controller='TemplateAdd'}{/link}" class="button">{icon size=16 name='plus'} <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 0bc987c031..8440f72abe 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">{icon size=16 name='list' type='solid'} <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'} <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">{icon size=16 name='search' type='solid'}</a>
+					<a href="#" class="button small">{icon size=16 name='magnifying-glass'}</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">{icon size=16 name='paint-brush' type='solid'}</a>
+					<a href="#" class="button small jsButtonIconColorPicker">{icon size=16 name='paintbrush'}</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">{icon size=16 name='paint-brush' type='solid'}</a>
+					<a href="#" id="test" class="button small jsButtonBadgeColorPicker">{icon size=16 name='paintbrush'}</a>
 				</dd>
 			</dl>
 		</div>
diff --git a/wcfsetup/install/files/acp/templates/trophyList.tpl b/wcfsetup/install/files/acp/templates/trophyList.tpl
index 5ab230df94..c9218df29c 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">{icon size=16 name='plus' type='solid'} <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'} <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">{icon size=16 name='pencil' type='solid'}</a>
+							<a href="{link controller='TrophyEdit' object=$trophy}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil'}</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">{icon size=16 name='plus' type='solid'} <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'} <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 1ad7e3ea78..1f0583f94d 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">{icon size=16 name='arrow-rotate-right' type='solid'} <span>{lang}wcf.acp.user.activityPoint.updateEvents{/lang}</span></a></li>
+			<li><a id="updateEvents" class="button">{icon size=16 name='arrow-rotate-right'} <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 07db3baeb1..f60c3f8795 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">
-								{icon size=16 name='pencil' type='solid'}
+								{icon size=16 name='pencil'}
 								<span>{lang}wcf.global.button.edit{/lang}</span>
 							</a>
 
@@ -161,7 +161,7 @@
 				{/if}
 			{/hascontent}
 
-			<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='UserList'}{/link}" class="button">{icon size=16 name='list'} <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 0e1c1af675..4239628ba5 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">{icon size=16 name='sort' type='solid'} <span>{lang}wcf.acp.group.button.choose{/lang}</span></a>
+						<a class="button dropdownToggle">{icon size=16 name='sort'} <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">{icon size=16 name='copy' type='solid'} <span>{lang}wcf.acp.group.button.copy{/lang}</span></a></li>
+					<li><a class="jsButtonUserGroupCopy button">{icon size=16 name='copy'} <span>{lang}wcf.acp.group.button.copy{/lang}</span></a></li>
 				{/if}
 			{/if}
 			
-			<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>
+			<li><a href="{link controller='UserGroupList'}{/link}" class="button">{icon size=16 name='list'} <span>{lang}wcf.acp.menu.link.group.list{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
diff --git a/wcfsetup/install/files/acp/templates/userGroupAssignmentAdd.tpl b/wcfsetup/install/files/acp/templates/userGroupAssignmentAdd.tpl
index 345500def3..439d8170be 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">{icon size=16 name='list' type='solid'} <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'} <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 70e1f5a335..71a81c88fb 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">{icon size=16 name='plus' type='solid'} <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'} <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">{icon size=16 name='pencil' type='solid'}</a>
+							<a href="{link controller='UserGroupAssignmentEdit' object=$assignment}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil'}</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">{icon size=16 name='plus' type='solid'} <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'} <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 d8fa4786cc..df8601708f 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">{icon size=16 name='check' type='solid'} {lang}wcf.acp.option.type.boolean.yes{/lang}</label>
+		<label for="{$option->optionName}" class="green">{icon size=16 name='check'} {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">{icon size=16 name='times' type='solid'} {lang}wcf.acp.option.type.boolean.no{/lang}</label>
+		<label for="{$option->optionName}_no" class="red">{icon size=16 name='xmark'} {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">{icon size=16 name='ban' type='solid'} {lang}wcf.acp.option.type.boolean.never{/lang}</label>
+			<label for="{$option->optionName}_never" class="yellow">{icon size=16 name='ban'} {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 70b795b9ad..52db0db969 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">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.group.add{/lang}</span></a></li>
+						<li><a href="{link controller='UserGroupAdd'}{/link}" class="button">{icon size=16 name='plus'} <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">{icon size=16 name='pencil' type='solid'}</a>
+							<a href="{link controller='UserGroupEdit' id=$group->groupID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil'}</a>
 						{else}
 							<span class="icon icon16 fa-pencil disabled" title="{lang}wcf.global.button.edit{/lang}"></span>
 						{/if}
@@ -96,7 +96,7 @@
 			<ul>
 				{content}
 					{if $__wcf->getSession()->getPermission('admin.user.canAddGroup')}
-						<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>
+						<li><a href="{link controller='UserGroupAdd'}{/link}" class="button">{icon size=16 name='plus'} <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 7bb72b6dd2..5aeaa3b74f 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">{icon size=16 name='search' type='solid'} <span>{lang}wcf.acp.user.quickSearch{/lang}</span></a>
+							<a class="button dropdownToggle">{icon size=16 name='magnifying-glass'} <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">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.user.add{/lang}</span></a></li>
+						<li><a href="{link controller='UserAdd'}{/link}" class="button">{icon size=16 name='plus'} <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">{icon size=16 name='pencil' type='solid'} <span>{lang}wcf.global.button.edit{/lang}</span></a>
+								<a href="#" class="dropdownToggle button small">{icon size=16 name='pencil'} <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">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.user.add{/lang}</span></a></li>
+							<li><a href="{link controller='UserAdd'}{/link}" class="button">{icon size=16 name='plus'} <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 40bf39a97d..2fa98af84f 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">{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>
+			<li><a href="{link controller='UserList'}{/link}" class="button">{icon size=16 name='list'} <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='magnifying-glass'} <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 fa4540f530..5c2a4edeb8 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">{icon size=16 name='list' type='solid'} <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'} <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 2734d2d178..4d3875bc76 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">{icon size=16 name='list' type='solid'} <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'} <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 4951bab771..02ef5af2ad 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">{icon size=16 name='plus' type='solid'} <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'} <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">{icon size=16 name='pencil' type='solid'}</a>
+							<a href="{link controller='UserOptionCategoryEdit' id=$category->categoryID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil'}</a>
 							{if $category->userOptions > 0}
 								<span class="icon icon16 fa-times disabled"></span>
 							{else}
@@ -69,7 +69,7 @@
 		
 		<nav class="contentFooterNavigation">
 			<ul>
-				<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>
+				<li><a href="{link controller='UserOptionCategoryAdd'}{/link}" class="button">{icon size=16 name='plus'} <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 51e9003451..c2e90d993f 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">{icon size=16 name='plus' type='solid'} <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'} <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">{icon size=16 name='pencil' type='solid'}</a>
+							<a href="{link controller='UserOptionEdit' id=$option->optionID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil'}</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">{icon size=16 name='plus' type='solid'} <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'} <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 6b80984047..c15a16b91f 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">{icon size=16 name='list' type='solid'} <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'} <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 3702913850..1d2bc14aa8 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">{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>
+			<li><a id="updateEvents" class="button">{icon size=16 name='arrow-rotate-right'} <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'} <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">{icon size=16 name='pencil' type='solid'}</a>
+							<a href="{link controller='UserRankEdit' id=$userRank->rankID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil'}</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">{icon size=16 name='plus' type='solid'} <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'} <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 72ec6089f2..58c22e421a 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">{icon size=16 name='search' type='solid'} <span>{lang}wcf.acp.user.quickSearch{/lang}</span></a>
+				<a class="button dropdownToggle">{icon size=16 name='magnifying-glass'} <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 4cb06584bc..3faf978323 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">{icon size=16 name='list' type='solid'} <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'} <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 423d53c8a3..9b19cf9534 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">{icon size=16 name='plus' type='solid'} <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'} <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">{icon size=16 name='plus' type='solid'} <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'} <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 41bf5372f7..1777599c0b 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">{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>
+			<li><a href="{$object->getEditLink()}" class="button">{icon size=16 name='pencil'} <span>{lang}wcf.global.button.edit{/lang}</span></a></li>
+			<li><a href="{$object->getLink()}" class="button">{icon size=16 name='arrow-right'} <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 bab3e821e2..79b679a7de 100644
--- a/wcfsetup/install/files/acp/templates/worker.tpl
+++ b/wcfsetup/install/files/acp/templates/worker.tpl
@@ -1,7 +1,7 @@
 <div id="workerContainer">
 	<header class="box48 contentHeader">
 		<span class="workerStatusIcon">
-			{icon size=48 name='spinner' type='solid'}
+			{icon size=48 name='spinner'}
 		</span>
 		
 		<div>
-- 
2.20.1