diff --git a/Resources/Private/Partials/ContentResultTable.html b/Resources/Private/Partials/ContentResultTable.html
index f423279..323f5f0 100644
--- a/Resources/Private/Partials/ContentResultTable.html
+++ b/Resources/Private/Partials/ContentResultTable.html
@@ -35,7 +35,7 @@
                     <div class="neos-pull-right">
                         <button class="neos-button neos-button-danger" title="Remove this result" data-toggle="modal"
                                 href="#remove-{index}" data-neos-toggle="tooltip">
-                            <i class="icon-trash icon-white"></i>
+                            <i class="icon-trash icon-white fas fa-trash-alt"></i>
                         </button>
                         <div class="neos-hide" id="remove-{index}">
                             <div class="neos-modal-centered">
diff --git a/Resources/Private/Partials/ContentTable.html b/Resources/Private/Partials/ContentTable.html
index 698c75b..180692b 100644
--- a/Resources/Private/Partials/ContentTable.html
+++ b/Resources/Private/Partials/ContentTable.html
@@ -81,7 +81,7 @@
                                 action="display"
                                 arguments="{content:content}"
                                 additionalAttributes="{data-neos-toggle: 'tooltip', class: 'neos-button neos-button-primary'}">
-                                <i class="icon-info-sign icon-white"></i>
+                                <i class="icon-info-sign icon-white fas fa-info-circle"></i>
                             </neos:link.module>
                             <neos:link.module
                                 title="Edit Content"
@@ -89,11 +89,11 @@
                                 action="edit"
                                 arguments="{content:content}"
                                 additionalAttributes="{data-neos-toggle: 'tooltip', class: 'neos-button neos-button-primary'}">
-                                <i class="icon-pencil icon-white"></i>
+                                <i class="icon-pencil icon-white fas fa-pencil-alt"></i>
                             </neos:link.module>
                             <button class="neos-button neos-button-danger" title="Remove this content"
                                     data-toggle="modal" href="#remove-{index}" data-neos-toggle="tooltip">
-                                <i class="icon-trash icon-white"></i>
+                                <i class="icon-trash icon-white fas fa-trash-alt"></i>
                             </button>
                             <div class="neos-hide" id="remove-{index}">
                                 <div class="neos-modal-centered">
diff --git a/Resources/Private/Templates/Backend/ContentResults/Index.html b/Resources/Private/Templates/Backend/ContentResults/Index.html
index e888f55..a74e8f4 100644
--- a/Resources/Private/Templates/Backend/ContentResults/Index.html
+++ b/Resources/Private/Templates/Backend/ContentResults/Index.html
@@ -35,11 +35,11 @@
                                 action="display"
                                 arguments="{account:groupedContentResult.0.account}"
                                 additionalAttributes="{data-neos-toggle: 'tooltip', class: 'neos-button neos-button-primary'}">
-                                <i class="icon-info-sign icon-white"></i>
+                                <i class="icon-info-sign icon-white fas fa-info-circle"></i>
                             </neos:link.module>
                             <button class="neos-button neos-button-danger" title="Remove all results for this user"
                                     data-toggle="modal" href="#remove-{index}" data-neos-toggle="tooltip">
-                                <i class="icon-trash icon-white"></i>
+                                <i class="icon-trash icon-white fas fa-trash-alt"></i>
                             </button>
                             <div class="neos-hide" id="remove-{index}">
                                 <div class="neos-modal-centered">
diff --git a/Resources/Private/Templates/Backend/Library/Index.html b/Resources/Private/Templates/Backend/Library/Index.html
index 4694e07..c5b161b 100644
--- a/Resources/Private/Templates/Backend/Library/Index.html
+++ b/Resources/Private/Templates/Backend/Library/Index.html
@@ -50,7 +50,7 @@
                                         action="upgrade"
                                         arguments="{library:library}"
                                         additionalAttributes="{data-neos-toggle: 'tooltip', class: 'neos-button neos-button-primary'}">
-                                        <i class="icon-arrow-up icon-white"></i>
+                                        <i class="icon-arrow-up icon-white fas fa-arrow-up"></i>
                                     </neos:link.module>
                                 </f:if>
                                 <neos:link.module
@@ -59,7 +59,7 @@
                                     action="display"
                                     arguments="{library:library}"
                                     additionalAttributes="{data-neos-toggle: 'tooltip', class: 'neos-button neos-button-primary'}">
-                                    <i class="icon-info-sign icon-white"></i>
+                                    <i class="icon-info-sign icon-white fas fa-info-circle"></i>
                                 </neos:link.module>
 
                                 <f:if condition="{library.contents -> f:count()} > 0 || {library.contentDependencies -> f:count()} > 0 || {library.dependentLibraries -> f:count()} > 0">
@@ -67,13 +67,13 @@
                                         <button class="neos-button neos-button-danger neos-disabled"
                                                 title="Contents or other libraries are using this library"
                                                 href="#">
-                                            <i class="icon-trash icon-white"></i>
+                                            <i class="icon-trash icon-white fas fa-trash-alt"></i>
                                         </button>
                                     </f:then>
                                     <f:else>
                                         <button class="neos-button neos-button-danger" title="Remove this content"
                                                 data-toggle="modal" href="#remove-{index}" data-neos-toggle="tooltip">
-                                            <i class="icon-trash icon-white"></i>
+                                            <i class="icon-trash icon-white fas fa-trash-alt"></i>
                                         </button>
                                     </f:else>
                                 </f:if>