diff --git a/Resources/Private/Partials/Queue/Filter.html b/Resources/Private/Partials/Queue/Filter.html
index ac4649a9b5665173db0dd6841883be66a6288c58..5248d04d897c06d8e91eca3eb751006f4b4e0ec5 100644
--- a/Resources/Private/Partials/Queue/Filter.html
+++ b/Resources/Private/Partials/Queue/Filter.html
@@ -70,11 +70,7 @@
 				</div>
 				<span class="input-group-btn">
 					<label class="btn btn-default" for="filter-from-date">
-						<span class="t3js-icon icon icon-size-small icon-state-default icon-actions-edit-pick-date" data-identifier="actions-edit-pick-date">
-							<span class="icon-markup">
-								<img src="/typo3/sysext/core/Resources/Public/Icons/T3Icons/actions/actions-edit-pick-date.svg" width="16" height="16">
-							</span>
-						</span>
+						<core:icon identifier="actions-calendar"/>
 					</label>
 				</span>
 			</div>
@@ -90,11 +86,7 @@
 				</div>
 				<span class="input-group-btn">
 					<label class="btn btn-default" for="filter-to-date">
-						<span class="t3js-icon icon icon-size-small icon-state-default icon-actions-edit-pick-date" data-identifier="actions-edit-pick-date">
-							<span class="icon-markup">
-								<img src="/typo3/sysext/core/Resources/Public/Icons/T3Icons/actions/actions-edit-pick-date.svg" width="16" height="16">
-							</span>
-						</span>
+						<core:icon identifier="actions-calendar"/>
 					</label>
 				</span>
 			</div>
diff --git a/Resources/Private/Templates/Queue/Index.html b/Resources/Private/Templates/Queue/Index.html
index c75f7eeb34a2560755db9897f0b76cb27419845f..55b2247a7bdef901381b5af8613eaf4e5ebcd562 100644
--- a/Resources/Private/Templates/Queue/Index.html
+++ b/Resources/Private/Templates/Queue/Index.html
@@ -92,12 +92,7 @@
 													<f:link.action class="btn btn-default btn-send-now"
 																   controller="Queue" action="sendMail"
 																   arguments="{uid: mail.uid, selectedTemplate: selectedTemplateKey, selectedExtension: selectedExtensionKey}">
-														<span
-															class="t3js-icon icon icon-size-small icon-state-default actions-document-import-t3d">
-															<span class="icon-markup">
-																<core:icon identifier="actions-document-import-t3d"/>
-															</span>
-														</span>
+														<core:icon identifier="actions-document-import-t3d"/>
 														<f:translate key="backend.send_now"/>
 													</f:link.action>
 												</f:else>