diff --git a/app/Presenters/UserPresenter.php b/app/Presenters/UserPresenter.php
index 7054676a9..635eaa86a 100644
--- a/app/Presenters/UserPresenter.php
+++ b/app/Presenters/UserPresenter.php
@@ -492,6 +492,6 @@ class UserPresenter extends Presenter
 
     public function glyph()
     {
-        return '<i class="fas fa-user" aria-hidden="true"></i>';
+        return '<x-icon type="user"/>';
     }
 }
diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index 3b7524f45..2da403834 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -903,19 +903,13 @@
                                                 @else
                                                     {{ trans('general.na_no_purchase_date') }}
                                                 @endif
-                                                @if ($asset->eol_explicit)
-
+                                                @if ($asset->eol_explicit =='1')
                                                         <span data-tooltip="true"
                                                                 data-placement="top"
                                                                 data-title="Explicit EOL"
                                                                 title="Explicit EOL">
                                                                 <x-icon type="warning" class="text-orange" />
                                                         </span>
-
-                                                        <i class="fas fa-exclamation-triangle text-orange"
-
-                                                       >
-                                                    </i>
                                                 @endif
                                             </div>
                                         </div>
diff --git a/resources/views/licenses/view.blade.php b/resources/views/licenses/view.blade.php
index 6afbcffe4..cab6a58be 100755
--- a/resources/views/licenses/view.blade.php
+++ b/resources/views/licenses/view.blade.php
@@ -531,7 +531,7 @@
                 <td>
                   @if ($file->filename)
                     <a href="{{ route('show.licensefile', [$license->id, $file->id]) }}" class="btn btn-sm btn-default">
-                      <i class="fas fa-download" aria-hidden="true"></i>
+                      <x-icon type="download"/>
                       <span class="sr-only">{{ trans('general.download') }}</span>
                     </a>