diff --git a/typo3/sysext/beuser/Resources/Private/Templates/Permission/Edit.html b/typo3/sysext/beuser/Resources/Private/Templates/Permission/Edit.html
index 468edf9e794d141e3e5b1fe221887f1ed0db91ef..294bf894b7a0788bab6fbef1ec80d71227d2e745 100644
--- a/typo3/sysext/beuser/Resources/Private/Templates/Permission/Edit.html
+++ b/typo3/sysext/beuser/Resources/Private/Templates/Permission/Edit.html
@@ -4,9 +4,11 @@
 <f:layout name="Permission" />
 
 <f:section name="iconButtons">
-	<f:be.buttons.icon uri="{f:uri.action(action:'index')}" icon="actions-view-go-back" />
+	<a href="{f:uri.action(action:'index')}">
+		<core:icon identifier="actions-view-go-back" />
+	</a>
 	<a href="#" onclick="{previewUrl}" title="{f:translate(key: 'LLL:EXT:lang/locallang_core.xlf:labels.showPage')}">
-		<core:icon identifier="actions-document-view" size="small" />
+		<core:icon identifier="actions-document-view" />
 	</a>
 </f:section>
 
diff --git a/typo3/sysext/core/Classes/Imaging/IconRegistry.php b/typo3/sysext/core/Classes/Imaging/IconRegistry.php
index a005c32385db93655f16de99c921ec22c53c5967..2e31c1cfba54c8e58b2ec7a86155d9b7b84d6bac 100644
--- a/typo3/sysext/core/Classes/Imaging/IconRegistry.php
+++ b/typo3/sysext/core/Classes/Imaging/IconRegistry.php
@@ -124,6 +124,18 @@ class IconRegistry implements \TYPO3\CMS\Core\SingletonInterface {
 				'name' => 'clipboard',
 			)
 		),
+		'actions-document-save' => array(
+			'provider' => BitmapIconProvider::class,
+			'options' => array(
+				'source' => 'EXT:t3skin/images/icons/actions/document-save.png'
+			)
+		),
+		'actions-document-save-close' => array(
+			'provider' => BitmapIconProvider::class,
+			'options' => array(
+				'source' => 'EXT:t3skin/images/icons/actions/document-save-close.png'
+			)
+		),
 		'actions-document-view' => array(
 			'provider' => FontawesomeIconProvider::class,
 			'options' => array(
@@ -298,6 +310,12 @@ class IconRegistry implements \TYPO3\CMS\Core\SingletonInterface {
 				'name' => 'refresh',
 			)
 		),
+		'actions-system-refresh' => array(
+			'provider' => FontawesomeIconProvider::class,
+			'options' => array(
+				'name' => 'refresh',
+			)
+		),
 		'actions-version-swap-version' => array(
 			'provider' => FontawesomeIconProvider::class,
 			'options' => array(
@@ -310,6 +328,42 @@ class IconRegistry implements \TYPO3\CMS\Core\SingletonInterface {
 				'name' => 'check-square-o',
 			)
 		),
+		'actions-view-go-back' => array(
+			'provider' => FontawesomeIconProvider::class,
+			'options' => array(
+				'name' => 'angle-double-left',
+			)
+		),
+		'actions-view-go-up' => array(
+			'provider' => FontawesomeIconProvider::class,
+			'options' => array(
+				'name' => 'level-up',
+			)
+		),
+		'actions-view-paging-first' => array(
+			'provider' => FontawesomeIconProvider::class,
+			'options' => array(
+				'name' => 'step-backward',
+			)
+		),
+		'actions-view-paging-last' => array(
+			'provider' => FontawesomeIconProvider::class,
+			'options' => array(
+				'name' => 'step-forward',
+			)
+		),
+		'actions-view-paging-previous' => array(
+			'provider' => FontawesomeIconProvider::class,
+			'options' => array(
+				'name' => 'arrow-left',
+			)
+		),
+		'actions-view-paging-next' => array(
+			'provider' => FontawesomeIconProvider::class,
+			'options' => array(
+				'name' => 'arrow-right',
+			)
+		),
 
 		// Status
 		'status-status-current' => array(
diff --git a/typo3/sysext/cshmanual/Resources/Private/Templates/Help/All.html b/typo3/sysext/cshmanual/Resources/Private/Templates/Help/All.html
index b06a70174a8c3ec1bfc38f7fb0e03a4c02f4c001..c381970ad11429f711e79b12a2af2b0d92b2e338 100644
--- a/typo3/sysext/cshmanual/Resources/Private/Templates/Help/All.html
+++ b/typo3/sysext/cshmanual/Resources/Private/Templates/Help/All.html
@@ -1,7 +1,10 @@
+{namespace core=TYPO3\CMS\Core\ViewHelpers}
 <f:layout name="Default" />
 
 <f:section name="docheader">
-	<f:be.buttons.icon uri="{f:uri.action(action:'index')}" icon="actions-view-go-up" />
+	<a href="{f:uri.action(action:'index')}">
+		<core:icon identifier="actions-view-go-up" />
+	</a>
 </f:section>
 
 <f:section name="content">
diff --git a/typo3/sysext/cshmanual/Resources/Private/Templates/Help/Detail.html b/typo3/sysext/cshmanual/Resources/Private/Templates/Help/Detail.html
index d91dece59da2f27e21818d6a66f240294b41fa6b..c35312ec5e10bb0de99b40f1f7b07bc18feba5e8 100644
--- a/typo3/sysext/cshmanual/Resources/Private/Templates/Help/Detail.html
+++ b/typo3/sysext/cshmanual/Resources/Private/Templates/Help/Detail.html
@@ -1,8 +1,11 @@
 {namespace csh=TYPO3\CMS\Cshmanual\ViewHelpers}
+{namespace core=TYPO3\CMS\Core\ViewHelpers}
 <f:layout name="Default" />
 
 <f:section name="docheader">
-	<f:be.buttons.icon uri="{f:uri.action(action:'index')}" icon="actions-view-go-up" />
+	<a href="{f:uri.action(action:'index')}">
+		<core:icon identifier="actions-view-go-up" />
+	</a>
 </f:section>
 
 <f:section name="content">
diff --git a/typo3/sysext/extensionmanager/Resources/Private/Templates/Configuration/ShowConfigurationForm.html b/typo3/sysext/extensionmanager/Resources/Private/Templates/Configuration/ShowConfigurationForm.html
index 0edcf5ed76a9f88b593cc314e25d3088326e9c8e..0045f6a1549b59e9560a1d81fdd143290181b315 100644
--- a/typo3/sysext/extensionmanager/Resources/Private/Templates/Configuration/ShowConfigurationForm.html
+++ b/typo3/sysext/extensionmanager/Resources/Private/Templates/Configuration/ShowConfigurationForm.html
@@ -1,10 +1,17 @@
 {namespace em=TYPO3\CMS\Extensionmanager\ViewHelpers}
+{namespace core=TYPO3\CMS\Core\ViewHelpers}
 <f:layout name="main" />
 
 <f:section name="docheader-buttons">
-	<f:be.buttons.icon uri="{f:uri.action(action:'index',controller:'List',additionalParams:{search:extension.key})}" icon="actions-view-go-back" title="{f:translate(key:'extConfTemplate.backToList')}" />
-	<f:be.buttons.icon uri="javascript:document.configurationform.submit();" icon="actions-document-save" title="{f:translate(key:'LLL:EXT:lang/locallang_common.xlf:save')}" />
-	<f:be.buttons.icon uri="#" icon="actions-document-save-close" title="{f:translate(key:'LLL:EXT:lang/locallang_common.xlf:saveAndClose')}" />
+	<a href="{f:uri.action(action:'index',controller:'List',additionalParams:{search:extension.key})}" title="{f:translate(key:'extConfTemplate.backToList')}">
+		<core:icon identifier="actions-view-go-back" />
+	</a>
+	<a href="javascript:document.configurationform.submit();" title="{f:translate(key:'LLL:EXT:lang/locallang_common.xlf:save')}">
+		<core:icon identifier="actions-document-save" />
+	</a>
+	<a href="#" title="{f:translate(key:'LLL:EXT:lang/locallang_common.xlf:saveAndClose')}" class="t3js-save-close">
+		<core:icon identifier="actions-document-save-close" />
+	</a>
 </f:section>
 
 <f:section name="module-headline">
diff --git a/typo3/sysext/extensionmanager/Resources/Private/Templates/Distribution/Show.html b/typo3/sysext/extensionmanager/Resources/Private/Templates/Distribution/Show.html
index 35bc3c355f951e2ef9faa9b16af732842d174040..86c0ea60f8ecfc45703133f333f2574e471555a2 100644
--- a/typo3/sysext/extensionmanager/Resources/Private/Templates/Distribution/Show.html
+++ b/typo3/sysext/extensionmanager/Resources/Private/Templates/Distribution/Show.html
@@ -3,7 +3,9 @@
 <f:layout name="main" />
 
 <f:section name="docheader-buttons">
-	<f:be.buttons.icon uri="{f:uri.action(controller: 'List',action: 'distributions')}" icon="actions-view-go-back" title="{f:translate(key:'extConfTemplate.backToList')}" />
+	<a href="{f:uri.action(controller: 'List',action: 'distributions')}" title="{f:translate(key:'extConfTemplate.backToList')}">
+		<core:icon identifier="actions-view-go-back" />
+	</a>
 </f:section>
 
 <f:section name="module-headline">
@@ -45,12 +47,12 @@
 						</f:if>
 						<li>
 							<button class="btn btn-default distribution-openViewModule" onclick="top.goToModule('web_ViewpageView');">
-								<f:be.buttons.icon icon="actions-document-view"	/><f:translate key="distribution.welcome.openViewModule" />
+								<core:icon identifier="actions-document-view" /><f:translate key="distribution.welcome.openViewModule" />
 							</button>
 						</li>
 						<li>
 							<button class="btn btn-default distribution-openPageModule" onclick="top.goToModule('web_page');">
-								<f:be.buttons.icon icon="actions-document-open"	/><f:translate key="distribution.welcome.openPageModule" />
+								<core:icon identifier="actions-document-open" /><f:translate key="distribution.welcome.openPageModule" />
 							</button>
 						</li>
 					</f:then>
diff --git a/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Index.html b/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Index.html
index c16d264781f0cf40d38e8702fbe9e23c702b0c58..dc813703e3da2c14d36bd05317b4cd25f1db0219 100644
--- a/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Index.html
+++ b/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Index.html
@@ -5,7 +5,9 @@
 
 <f:section name="docheader-buttons">
 	<div id="upload-button-wrap">
-		<f:be.buttons.icon uri="{f:uri.action(action:'form',controller:'UploadExtensionFile')}" icon="actions-edit-upload" title="{f:translate(key:'extensionList.uploadExtension')}"/>
+		<a href="{f:uri.action(action:'form',controller:'UploadExtensionFile')}" title="{f:translate(key:'extensionList.uploadExtension')}">
+			<core:icon identifier="actions-edit-upload" />
+		</a>
 	</div>
 </f:section>
 
diff --git a/typo3/sysext/extensionmanager/Resources/Private/Templates/List/ShowAllVersions.html b/typo3/sysext/extensionmanager/Resources/Private/Templates/List/ShowAllVersions.html
index 0327fde1ab8f003699e5f2c931c6ec3dac0da26c..36d998f4c8d4312edea115fdf1bfb204826980f5 100644
--- a/typo3/sysext/extensionmanager/Resources/Private/Templates/List/ShowAllVersions.html
+++ b/typo3/sysext/extensionmanager/Resources/Private/Templates/List/ShowAllVersions.html
@@ -1,9 +1,12 @@
 {namespace em=TYPO3\CMS\Extensionmanager\ViewHelpers}
+{namespace core=TYPO3\CMS\Core\ViewHelpers}
 
 <f:layout name="main"/>
 
 <f:section name="docheader-buttons">
-	<f:be.buttons.icon uri="{f:uri.action(action: 'ter')}" icon="actions-view-go-back" title="{f:translate(key:'extConfTemplate.backToList')}" />
+	<a href="{f:uri.action(action: 'ter')}" title="{f:translate(key:'extConfTemplate.backToList')}">
+		<core:icon identifier="actions-view-go-back" />
+	</a>
 </f:section>
 
 <f:section name="module-headline">
diff --git a/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Ter.html b/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Ter.html
index 4b461e58c56f1e162ccf70a3509bf2bc8892251f..61700b6189b8d7bd77cc97137ef2373d9920d4f8 100644
--- a/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Ter.html
+++ b/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Ter.html
@@ -1,10 +1,12 @@
 {namespace em=TYPO3\CMS\Extensionmanager\ViewHelpers}
-
+{namespace core=TYPO3\CMS\Core\ViewHelpers}
 <f:layout name="main"/>
 
 <f:section name="docheader-buttons">
 	<div id="upload-button-wrap">
-		<f:be.buttons.icon uri="{f:uri.action(action:'form',controller:'UploadExtensionFile')}" icon="actions-edit-upload" title="{f:translate(key:'extensionList.uploadExtension')}"/>
+		<a href="{f:uri.action(action:'form',controller:'UploadExtensionFile')}" title="{f:translate(key:'extensionList.uploadExtension')}">
+			<core:icon identifier="actions-edit-upload" />
+		</a>
 	</div>
 </f:section>
 
diff --git a/typo3/sysext/extensionmanager/Resources/Private/Templates/UpdateScript/Show.html b/typo3/sysext/extensionmanager/Resources/Private/Templates/UpdateScript/Show.html
index 17d86ea55b6b57d39d293302e58aa6a6770a3e7b..d86540baa172c5e7fd66cec44ad4b24b8127faf0 100644
--- a/typo3/sysext/extensionmanager/Resources/Private/Templates/UpdateScript/Show.html
+++ b/typo3/sysext/extensionmanager/Resources/Private/Templates/UpdateScript/Show.html
@@ -1,9 +1,11 @@
 {namespace em=TYPO3\CMS\Extensionmanager\ViewHelpers}
-
+{namespace core=TYPO3\CMS\Core\ViewHelpers}
 <f:layout name="main" />
 
 <f:section name="docheader-buttons">
-	<f:be.buttons.icon uri="{f:uri.action(action:'index',controller:'List',additionalParams:{search:extensionKey})}" icon="actions-view-go-back" title="{f:translate(key:'extConfTemplate.backToList')}" />
+	<a href="{f:uri.action(action:'index',controller:'List',additionalParams:{search:extensionKey})}" title="{f:translate(key:'extConfTemplate.backToList')}">
+		<core:icon identifier="actions-view-go-back" />
+	</a>
 </f:section>
 
 <f:section name="module-headline">
diff --git a/typo3/sysext/extensionmanager/Resources/Public/JavaScript/Main.js b/typo3/sysext/extensionmanager/Resources/Public/JavaScript/Main.js
index 4d51cb24f0a12547310cda0e55d1341cca93699c..6fc5e085ab2394fc590da64976b3c5c85ade0764 100644
--- a/typo3/sysext/extensionmanager/Resources/Public/JavaScript/Main.js
+++ b/typo3/sysext/extensionmanager/Resources/Public/JavaScript/Main.js
@@ -684,7 +684,7 @@ define(['jquery', 'nprogress', 'datatables', 'TYPO3/CMS/Backend/jquery.clearable
 			ExtensionManager.configurationFieldSupport();
 			var $validate = $('.validate');
 			$validate.validate();
-			$(document).on('click', '.t3-icon-document-save-close', function() {
+			$(document).on('click', '.t3js-save-close', function() {
 				$validate.append($('<input />', {type: 'hidden', name: 'tx_extensionmanager_tools_extensionmanagerextensionmanager[action]', value: 'saveAndClose'})).submit();
 			});
 
diff --git a/typo3/sysext/fluid/Resources/Private/Templates/ViewHelpers/Be/Widget/Paginate/Index.html b/typo3/sysext/fluid/Resources/Private/Templates/ViewHelpers/Be/Widget/Paginate/Index.html
index 24a1d7c17999fc78303e2aa309ec5488b096c869..67dc11ab86512729557dcd342c36f4737d5f8fae 100644
--- a/typo3/sysext/fluid/Resources/Private/Templates/ViewHelpers/Be/Widget/Paginate/Index.html
+++ b/typo3/sysext/fluid/Resources/Private/Templates/ViewHelpers/Be/Widget/Paginate/Index.html
@@ -1,3 +1,4 @@
+{namespace core=TYPO3\CMS\Core\ViewHelpers}
 <f:if condition="{configuration.insertAbove}">
 	<f:render section="paginator" arguments="{pagination: pagination, position:'top', recordsLabel: configuration.recordsLabel}" />
 </f:if>
@@ -14,35 +15,25 @@
 			<f:if condition="{pagination.hasLessPages}">
 				<f:then>
 					<li>
-						<f:be.buttons.icon
-							uri="{f:widget.uri(arguments:{currentPage: 1})}"
-							icon="actions-view-paging-first"
-							title="{f:translate(key:'widget.pagination.first')}"
-						/>
+						<a href="{f:widget.uri(arguments:{currentPage: 1})}" title="{f:translate(key:'widget.pagination.first')}">
+							<core:icon identifier="actions-view-paging-first" />
+						</a>
 					</li>
 					<li>
-						<f:be.buttons.icon
-							uri="{f:widget.uri(arguments:{currentPage: pagination.previousPage})}"
-							icon="actions-view-paging-previous"
-							title="{f:translate(key:'widget.pagination.previous')}"
-						/>
+						<a href="{f:widget.uri(arguments:{currentPage: pagination.previousPage})}" title="{f:translate(key:'widget.pagination.previous')}">
+							<core:icon identifier="actions-view-paging-previous" />
+						</a>
 					</li>
 				</f:then>
 				<f:else>
 					<li class="disabled">
 						<span>
-							<f:be.buttons.icon
-								uri=""
-								icon="actions-view-paging-first"
-							/>
+							<core:icon identifier="actions-view-paging-first" />
 						</span>
 					</li>
 					<li class="disabled">
 						<span>
-							<f:be.buttons.icon
-								uri=""
-								icon="actions-view-paging-previous"
-							/>
+							<core:icon identifier="actions-view-paging-previous" />
 						</span>
 					</li>
 				</f:else>
@@ -87,45 +78,33 @@
 			<f:if condition="{pagination.hasMorePages}">
 				<f:then>
 					<li>
-						<f:be.buttons.icon
-							uri="{f:widget.uri(arguments:{currentPage: pagination.nextPage})}"
-							icon="actions-view-paging-next"
-							title="{f:translate(key:'widget.pagination.next')}"
-						/>
+						<a href="{f:widget.uri(arguments:{currentPage: pagination.nextPage})}" title="{f:translate(key:'widget.pagination.next')}">
+							<core:icon identifier="actions-view-paging-next" />
+						</a>
 					</li>
 					<li>
-						<f:be.buttons.icon
-							uri="{f:widget.uri(arguments:{currentPage: pagination.numberOfPages})}"
-							icon="actions-view-paging-last"
-							title="{f:translate(key:'widget.pagination.last')}"
-						/>
+						<a href="{f:widget.uri(arguments:{currentPage: pagination.numberOfPages})}" title="{f:translate(key:'widget.pagination.last')}">
+							<core:icon identifier="actions-view-paging-last" />
+						</a>
 					</li>
 				</f:then>
 				<f:else>
 					<li class="disabled">
 						<span>
-							<f:be.buttons.icon
-								uri=""
-								icon="actions-view-paging-next"
-							/>
+							<core:icon identifier="actions-view-paging-next" />
 						</span>
 					</li>
 					<li class="disabled">
 						<span>
-							<f:be.buttons.icon
-								uri=""
-								icon="actions-view-paging-last"
-							/>
+							<core:icon identifier="actions-view-paging-last" />
 						</span>
 					</li>
 				</f:else>
 			</f:if>
 			<li>
-				<f:be.buttons.icon
-					uri="{f:widget.uri(arguments:{currentPage: pagination.current})}"
-					icon="actions-system-refresh"
-					title="{f:translate(key:'widget.pagination.refresh')}"
-				/>
+				<a href="{f:widget.uri(arguments:{currentPage: pagination.current})}" title="{f:translate(key:'widget.pagination.refresh')}">
+					<core:icon identifier="actions-system-refresh" />
+				</a>
 			</li>
 		</ul>
 	</nav>
diff --git a/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/Statistic.html b/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/Statistic.html
index 6d27f179a17e5aca0af9423ff052dfb266e96e6a..4f05277efc9fcaf8494a12533fa88e61ff90d472 100644
--- a/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/Statistic.html
+++ b/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/Statistic.html
@@ -1,4 +1,5 @@
 {namespace is=TYPO3\CMS\IndexedSearch\ViewHelpers}
+{namespace core=TYPO3\CMS\Core\ViewHelpers}
 
 <f:layout name="Administration"/>
 
@@ -21,7 +22,9 @@
 					<tr>
 						<th></th>
 						<th>
-							<f:be.buttons.icon title="{f:translate(key:'administration.removeAllEntries')}" icon="actions-edit-delete" uri="{f:uri.action(action:'deleteIndexedItem',arguments:'{id:\'ALL\',depth:depth,mode:mode}')}"/>
+							<a href="{f:uri.action(action:'deleteIndexedItem', arguments:'{id:\'ALL\', depth:depth, mode:mode}')}" title="{f:translate(key:'administration.removeAllEntries')}">
+								<core:icon identifier="actions-edit-delete" />
+							</a>
 						</th>
 						<th>
 							<f:translate key="field.fileName"/>
@@ -61,7 +64,9 @@
 												<f:if condition="{i.index} == 0"> {line.row.title}</f:if>
 											</td>
 											<td>
-												<f:be.buttons.icon  title="{f:translate(key:'administration.removeEntry')}" icon="actions-edit-delete" uri="{f:uri.action(action:'deleteIndexedItem',arguments:'{id:l.phash,depth:depth,mode:mode}')}"/>
+												<a href="{f:uri.action(action:'deleteIndexedItem',arguments:'{id:l.phash,depth:depth,mode:mode}')}" title="{f:translate(key:'administration.removeEntry')}">
+													<core:icon identifier="actions-edit-delete" />
+												</a>
 											</td>
 											<td>
 												<f:image src="{l.icon}"/>
diff --git a/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/StatisticDetails.html b/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/StatisticDetails.html
index 69283053113d16456674d7b787cc6fb425ec2c81..547ddb00825afa542a44cd04d40ad282504fb526 100644
--- a/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/StatisticDetails.html
+++ b/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/StatisticDetails.html
@@ -1,4 +1,5 @@
 {namespace is=TYPO3\CMS\IndexedSearch\ViewHelpers}
+{namespace core=TYPO3\CMS\Core\ViewHelpers}
 
 <f:layout name="Administration"/>
 
@@ -194,5 +195,7 @@
 </f:section>
 
 <f:section name="Buttons">
-	<f:be.buttons.icon title="{f:translate(key:'administration.back')}" icon="actions-view-go-back" uri="{f:uri.action(action:'statistic')}"/>
+	<a href="{f:uri.action(action:'statistic')}" title="{f:translate(key:'administration.back')}">
+		<core:icon identifier="actions-view-go-back" />
+	</a>
 </f:section>
diff --git a/typo3/sysext/lang/Resources/Private/Templates/Language/ListLanguages.html b/typo3/sysext/lang/Resources/Private/Templates/Language/ListLanguages.html
index a3b7636747de5f1df26b68e8ee873109057c9666..890b06b83eb1f88f079ad19bd25842765bb5b9c4 100644
--- a/typo3/sysext/lang/Resources/Private/Templates/Language/ListLanguages.html
+++ b/typo3/sysext/lang/Resources/Private/Templates/Language/ListLanguages.html
@@ -13,8 +13,8 @@
 		<span class="menuItem loadingItem">
 			<span title="" class="t3-icon fa fa-spin fa-circle-o-notch">&nbsp;</span>
 		</span>
-		<span class="menuItem cancelItem" data-action="cancelLanguageUpdate">
-			&nbsp;<f:be.buttons.icon icon="actions-document-close" title="{f:translate(key:'button.cancel')}"/>
+		<span class="menuItem cancelItem" data-action="cancelLanguageUpdate" title="{f:translate(key:'button.cancel')}">
+			&nbsp;<core:icon identifier="actions-document-close" />
 		</span>
 	</div>
 </f:section>
diff --git a/typo3/sysext/lang/Resources/Public/JavaScript/LanguageModule.js b/typo3/sysext/lang/Resources/Public/JavaScript/LanguageModule.js
index bd4ccd0be415ecdf42fae63d468ce967c915f626..34feb6f01d6525892e7bf02e9afe999240ca8e3d 100644
--- a/typo3/sysext/lang/Resources/Public/JavaScript/LanguageModule.js
+++ b/typo3/sysext/lang/Resources/Public/JavaScript/LanguageModule.js
@@ -345,6 +345,8 @@ define('TYPO3/CMS/Lang/LanguageModule', ['jquery', 'moment', 'datatables', 'TYPO
 				LanguageModule.handleActionEvent($element.parent(), event);
 			} else if ($element.parent().parent().data('action') !== undefined) {
 				LanguageModule.handleActionEvent($element.parent().parent(), event);
+			} else if ($element.parent().parent().parent().parent().data('action') !== undefined) {
+				LanguageModule.handleActionEvent($element.parent().parent().parent().parent(), event);
 			}
 		});
 	};
diff --git a/typo3/sysext/recycler/Resources/Private/Templates/RecyclerModule/Index.html b/typo3/sysext/recycler/Resources/Private/Templates/RecyclerModule/Index.html
index b844c302a233aed39fd17b47e2ab48a31b1e4e3d..ba1bcb47df2951cfbdde50028b5613a42e31ed24 100644
--- a/typo3/sysext/recycler/Resources/Private/Templates/RecyclerModule/Index.html
+++ b/typo3/sysext/recycler/Resources/Private/Templates/RecyclerModule/Index.html
@@ -1,7 +1,8 @@
+{namespace core=TYPO3\CMS\Core\ViewHelpers}
 <f:layout name="Default" />
 
 <f:section name="iconButtons">
-	<a data-action="reload"><f:be.buttons.icon icon="actions-system-refresh" title="{f:translate(key:'button.reload')}" /></a>
+	<a data-action="reload" title="{f:translate(key:'button.reload')}"><core:icon identifier="actions-system-refresh" /></a>
 </f:section>
 
 <f:section name="content">
diff --git a/typo3/sysext/scheduler/Resources/Private/Templates/Backend/SchedulerModule/InfoScreen.html b/typo3/sysext/scheduler/Resources/Private/Templates/Backend/SchedulerModule/InfoScreen.html
index c6be71b59cc59e0fb745bfb5f75032156c47c8c3..57dc71485980d85c7509b740f2650358edbbf5f5 100644
--- a/typo3/sysext/scheduler/Resources/Private/Templates/Backend/SchedulerModule/InfoScreen.html
+++ b/typo3/sysext/scheduler/Resources/Private/Templates/Backend/SchedulerModule/InfoScreen.html
@@ -1,4 +1,5 @@
 {namespace s = TYPO3\CMS\Scheduler\ViewHelpers}
+{namespace core=TYPO3\CMS\Core\ViewHelpers}
 
 <p class="lead">
 	<f:translate key="msg.infoScreenIntro" />
@@ -27,7 +28,9 @@
 					<td>
 						<div class="btn-group" role="group">
 							<span class="btn btn-default">
-								<f:be.buttons.icon uri="{s:moduleLink(controller:'scheduler', action: 'add', arguments: '{class: class}')}" icon="actions-document-new" title="{f:translate(key:'LLL:EXT:lang/locallang_common.xlf:new')}"/>
+								<a href="{s:moduleLink(controller:'scheduler', action: 'add', arguments: '{class: class}')}" title="{f:translate(key:'LLL:EXT:lang/locallang_common.xlf:new')}">
+									<core:icon identifier="actions-document-new" />
+								</a>
 							</span>
 						</div>
 					</td>
diff --git a/typo3/sysext/sys_note/Resources/Private/Templates/Note/List.html b/typo3/sysext/sys_note/Resources/Private/Templates/Note/List.html
index 3a74347d6406c8dac894c21309581c3508b5056e..416cfd8e06c6873d352dac1ee8224fd0129a2e55 100644
--- a/typo3/sysext/sys_note/Resources/Private/Templates/Note/List.html
+++ b/typo3/sysext/sys_note/Resources/Private/Templates/Note/List.html
@@ -1,4 +1,5 @@
 {namespace notes=TYPO3\CMS\SysNote\ViewHelpers}
+{namespace core=TYPO3\CMS\Core\ViewHelpers}
 
 <f:layout name="Default" />
 
@@ -28,10 +29,12 @@
 						</f:if>
 
 						<div class="right icons">
-							<f:be.buttons.icon uri="{notes:deleteLink(id:note.uid)}"
-											   icon="actions-edit-delete"
-											   additionalAttributes="{class: 't3js-modal-trigger', data-severity: 'warning', data-title: '{f:translate(key: \'LLL:EXT:lang/locallang_common.xlf:delete\')}', data-content: '{f:translate(key: \'LLL:EXT:lang/locallang_alt_doc.xlf:deleteWarning\')}', data-button-close-text: '{f:translate(key: \'LLL:EXT:lang/locallang_common.xlf:cancel\')}'}" />
-							<f:be.buttons.icon uri="{notes:editLink(id:note.uid)}" icon="actions-document-open" />
+							<a href="{notes:deleteLink(id:note.uid)}" class="t3js-modal-trigger" data-severity="warning" data-title="{f:translate(key: 'LLL:EXT:lang/locallang_common.xlf:delete')}" data-content="{f:translate(key: 'LLL:EXT:lang/locallang_alt_doc.xlf:deleteWarning')}" data-button-close-text="{f:translate(key: 'LLL:EXT:lang/locallang_common.xlf:cancel')}">
+								<core:icon identifier="actions-edit-delete" />
+							</a>
+							<a href="{notes:editLink(id:note.uid)}">
+								<core:icon identifier="actions-document-open" />
+							</a>
 						</div>
 					</div>
 					<div class="content">
diff --git a/typo3/sysext/viewpage/Resources/Private/Layouts/DocHeader.html b/typo3/sysext/viewpage/Resources/Private/Layouts/DocHeader.html
index 116f0d6286c3834df94378f2f31cc8b8607bb9af..fd6b2b281b75f92f4a647a2cb77b55203cbdd269 100644
--- a/typo3/sysext/viewpage/Resources/Private/Layouts/DocHeader.html
+++ b/typo3/sysext/viewpage/Resources/Private/Layouts/DocHeader.html
@@ -1,3 +1,4 @@
+{namespace core=TYPO3\CMS\Core\ViewHelpers}
 <f:be.container
 	includeCssFiles="{
 		0:'{f:uri.resource(path:\'Css/ui-lightness/jquery-ui-1.10.3.custom.min.css\')}',
@@ -24,15 +25,14 @@
 			</div>
 			<div class="typo3-docheader-buttons">
 				<div class="left">
-					<f:be.buttons.icon uri="{url}"
-						additionalAttributes="{onclick: 'window.open(this.href,\'newTYPO3frontendWindow\').focus();return false;'}"
-						icon="actions-document-view" title="{f:translate(key: 'LLL:EXT:lang/locallang_core.xlf:labels.showPage')}"
-					/>
+					<a href="{url}" onclick="window.open(this.href, 'newTYPO3frontendWindow').focus();return false;" title="{f:translate(key: 'LLL:EXT:lang/locallang_core.xlf:labels.showPage')}">
+						<core:icon identifier="actions-document-view" />
+					</a>
 				</div>
 				<div class="right">
-					<f:be.buttons.icon
-							uri="javascript:document.getElementById('tx_viewpage_iframe').contentWindow.location.reload(true);"
-							icon="actions-system-refresh" title="{f:translate(key: 'refreshPage')}" />
+					<a href="javascript:document.getElementById('tx_viewpage_iframe').contentWindow.location.reload(true);" title="{f:translate(key: 'refreshPage')}">
+						<core:icon identifier="actions-system-refresh" />
+					</a>
 					<f:be.buttons.shortcut/>
 				</div>
 			</div>