diff --git a/typo3/sysext/backend/Resources/Private/Partials/Clipboard/TabContent.html b/typo3/sysext/backend/Resources/Private/Partials/Clipboard/TabContent.html
index 3ba2e5e4f72f3f933ae116959c47be864b97bf82..ac8f4ddd3093527584b0e38083cd2e5fae30ab78 100644
--- a/typo3/sysext/backend/Resources/Private/Partials/Clipboard/TabContent.html
+++ b/typo3/sysext/backend/Resources/Private/Partials/Clipboard/TabContent.html
@@ -22,23 +22,25 @@
 		</f:if>
 	</td>
 	<td class="col-control nowrap">
-		<div class="btn-group">
-			<f:if condition="{content.infoLink}">
+		<f:if condition="{content.infoLink}">
+			<div class="btn-group">
 				<a class="btn btn-default" href="#" onclick="{content.infoLink}"
 					 title="{f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info')}">
 					<f:format.raw>
 						<core:icon identifier="actions-document-info" alternativeMarkupIdentifier="inline"/>
 					</f:format.raw>
 				</a>
-			</f:if>
-			<f:if condition="{content.removeLink}">
+			</div>
+		</f:if>
+		<f:if condition="{content.removeLink}">
+			<div class="btn-group">
 				<a class="btn btn-default" href="{content.removeLink}#clip_head"
 					 title="{f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.removeItem')}">
 					<f:format.raw>
-						<core:icon identifier="actions-selection-delete" alternativeMarkupIdentifier="inline"/>
+						<core:icon identifier="actions-remove" alternativeMarkupIdentifier="inline"/>
 					</f:format.raw>
 				</a>
-			</f:if>
-		</div>
+			</div>
+		</f:if>
 	</td>
 </tr>
diff --git a/typo3/sysext/backend/Resources/Private/Templates/Clipboard/Main.html b/typo3/sysext/backend/Resources/Private/Templates/Clipboard/Main.html
index d42da626305409c455f128167864f442c7f79214..dd6e5f9159e224145b73a4d7fd2802ba2857bb7f 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/Clipboard/Main.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/Clipboard/Main.html
@@ -18,7 +18,7 @@
 							<f:if condition="{elementCount}">
 								<a href="{removeAllUrl}#clip_head"
 									 title="{f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:buttons.clear')}" class="btn btn-danger">
-									<f:format.raw><core:icon identifier="actions-close" alternativeMarkupIdentifier="inline"></core:icon></f:format.raw>
+									<f:format.raw><core:icon identifier="actions-remove" alternativeMarkupIdentifier="inline"></core:icon></f:format.raw>
 								</a>
 							</f:if>
 						</td>
diff --git a/typo3/sysext/beuser/Resources/Private/Templates/BackendUser/Index.html b/typo3/sysext/beuser/Resources/Private/Templates/BackendUser/Index.html
index e53cf75f801d708a708a7f7df788f212116760c1..5b8b334b7171ad969a3c833f3cd42603d5c211ac 100644
--- a/typo3/sysext/beuser/Resources/Private/Templates/BackendUser/Index.html
+++ b/typo3/sysext/beuser/Resources/Private/Templates/BackendUser/Index.html
@@ -29,7 +29,7 @@
 							</td>
 							<td>
 								<f:link.action action="removeFromCompareList" arguments="{uid: compareUser.uid}" class="pull-right btn btn-default">
-									<core:icon identifier="actions-selection-delete" />
+									<core:icon identifier="actions-remove" />
 								</f:link.action>
 							</td>
 						</tr>