diff --git a/app/Presenters/UserPresenter.php b/app/Presenters/UserPresenter.php
index 993dbbe42..029d3a143 100644
--- a/app/Presenters/UserPresenter.php
+++ b/app/Presenters/UserPresenter.php
@@ -312,7 +312,7 @@ class UserPresenter extends Presenter
     {
         if ($this->email) {
             return '<a href="mailto:'.$this->email.'">'.$this->email.'</a>'
-                .'<a href="mailto:'.$this->email.'" class="hidden-xs hidden-sm"><i class="fa fa-envelope"></i></a>';
+                .'<a href="mailto:'.$this->email.'" class="hidden-xs hidden-sm"><i class="far fa-envelope"></i></a>';
         }
 
         return '';
diff --git a/resources/views/accessories/checkout.blade.php b/resources/views/accessories/checkout.blade.php
index 695f31b60..035a3229a 100755
--- a/resources/views/accessories/checkout.blade.php
+++ b/resources/views/accessories/checkout.blade.php
@@ -60,13 +60,13 @@
                          <div class="callout callout-info">
 
                              @if ($accessory->requireAcceptance())
-                                 <i class="fa fa-envelope"></i>
+                                 <i class="far fa-envelope"></i>
                                  {{ trans('admin/categories/general.required_acceptance') }}
                                  <br>
                              @endif
 
                              @if ($accessory->getEula())
-                                 <i class="fa fa-envelope"></i>
+                                 <i class="far fa-envelope"></i>
                                  {{ trans('admin/categories/general.required_eula') }}
                                  <br>
                              @endif
diff --git a/resources/views/consumables/checkout.blade.php b/resources/views/consumables/checkout.blade.php
index de96f9c85..702c10f69 100644
--- a/resources/views/consumables/checkout.blade.php
+++ b/resources/views/consumables/checkout.blade.php
@@ -47,13 +47,13 @@
                   <div class="callout callout-info">
 
                     @if ($consumable->category->require_acceptance=='1')
-                      <i class="fa fa-envelope"></i>
+                      <i class="far fa-envelope"></i>
                       {{ trans('admin/categories/general.required_acceptance') }}
                       <br>
                     @endif
 
                     @if ($consumable->getEula())
-                      <i class="fa fa-envelope"></i>
+                      <i class="far fa-envelope"></i>
                       {{ trans('admin/categories/general.required_eula') }}
                         <br>
                     @endif
diff --git a/resources/views/hardware/checkout.blade.php b/resources/views/hardware/checkout.blade.php
index 30d0dab50..2abcdb671 100755
--- a/resources/views/hardware/checkout.blade.php
+++ b/resources/views/hardware/checkout.blade.php
@@ -111,13 +111,13 @@
                                     <div class="callout callout-info">
 
                                         @if ($asset->requireAcceptance())
-                                            <i class="fa fa-envelope" aria-hidden="true"></i>
+                                            <i class="far fa-envelope" aria-hidden="true"></i>
                                             {{ trans('admin/categories/general.required_acceptance') }}
                                             <br>
                                         @endif
 
                                         @if ($asset->getEula())
-                                            <i class="fa fa-envelope" aria-hidden="true"></i>
+                                            <i class="far fa-envelope" aria-hidden="true"></i>
                                             {{ trans('admin/categories/general.required_eula') }}
                                             <br>
                                         @endif
diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index c12847d5f..8f7045a02 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -179,7 +179,7 @@
                             <div class="col-md-8">
 
                                 <!-- start striped rows -->
-                                <div class="container row-new-striped">
+                                <div class="container row-striped">
 
                                     @if ($asset->assetstatus)
 
@@ -296,7 +296,7 @@
 
                                                     @if (($asset->model) && ($asset->model->manufacturer->url))
                                                         <li>
-                                                            <i class="fa fa-globe" aria-hidden="true"></i>
+                                                            <i class="fas fa-globe-americas" aria-hidden="true"></i>
                                                             <a href="{{ $asset->model->manufacturer->url }}">
                                                                 {{ $asset->model->manufacturer->url }}
                                                             </a>
@@ -322,7 +322,8 @@
                                                     @endif
 
                                                     @if (($asset->model) && ($asset->model->manufacturer->support_email))
-                                                        <li><i class="fa fa-envelope" aria-hidden="true"></i>
+                                                        <li>
+                                                            <i class="far fa-envelope" aria-hidden="true"></i>
                                                             <a href="mailto:{{ $asset->model->manufacturer->support_email }}">
                                                                 {{ $asset->model->manufacturer->support_email }}
                                                             </a>
@@ -792,7 +793,7 @@
                                         <ul class="list-unstyled" style="line-height: 25px;">
                                             @if ((isset($asset->assignedTo->email)) && ($asset->assignedTo->email!=''))
                                                 <li>
-                                                    <i class="fa fa-envelope-o" aria-hidden="true"></i>
+                                                    <i class="far fa-envelope" aria-hidden="true"></i>
                                                     <a href="mailto:{{ $asset->assignedTo->email }}">{{ $asset->assignedTo->email }}</a>
                                                 </li>
                                             @endif
diff --git a/resources/views/licenses/checkout.blade.php b/resources/views/licenses/checkout.blade.php
index 85f8ebadd..689873349 100755
--- a/resources/views/licenses/checkout.blade.php
+++ b/resources/views/licenses/checkout.blade.php
@@ -71,19 +71,19 @@
                             <div class="callout callout-info">
 
                                 @if ($license->requireAcceptance())
-                                    <i class="fa fa-envelope"></i>
+                                    <i class="far fa-envelope"></i>
                                     {{ trans('admin/categories/general.required_acceptance') }}
                                     <br>
                                 @endif
 
                                 @if ($license->getEula())
-                                    <i class="fa fa-envelope"></i>
+                                    <i class="far fa-envelope"></i>
                                     {{ trans('admin/categories/general.required_eula') }}
                                     <br>
                                 @endif
 
                                 @if (($license->category) && ($license->category->checkin_email))
-                                    <i class="fa fa-envelope"></i>
+                                    <i class="far fa-envelope"></i>
                                     {{ trans('admin/categories/general.checkin_email_notification') }}
                                     <br>
                                 @endif
diff --git a/resources/views/licenses/view.blade.php b/resources/views/licenses/view.blade.php
index 96b426d3d..ae1075367 100755
--- a/resources/views/licenses/view.blade.php
+++ b/resources/views/licenses/view.blade.php
@@ -71,7 +71,7 @@
                       @endcan
 
                       @if ($license->manufacturer->url)
-                        <br><i class="fa fa-globe" aria-hidden="true"></i> <a href="{{ $license->manufacturer->url }}" rel="noopener">{{ $license->manufacturer->url }}</a>
+                        <br><i class="fas fa-globe-americas" aria-hidden="true"></i> <a href="{{ $license->manufacturer->url }}" rel="noopener">{{ $license->manufacturer->url }}</a>
                       @endif
 
                       @if ($license->manufacturer->support_url)
@@ -85,7 +85,7 @@
                       @endif
 
                       @if ($license->manufacturer->support_email)
-                        <br><i class="fa fa-envelope" aria-hidden="true"></i> <a href="mailto:{{ $license->manufacturer->support_email }}">{{ $license->manufacturer->support_email }}</a>
+                        <br><i class="far fa-envelope" aria-hidden="true"></i> <a href="mailto:{{ $license->manufacturer->support_email }}">{{ $license->manufacturer->support_email }}</a>
                       @endif
                     </div>
                   </div>
diff --git a/resources/views/models/view.blade.php b/resources/views/models/view.blade.php
index 512d1fee9..c55588c7a 100755
--- a/resources/views/models/view.blade.php
+++ b/resources/views/models/view.blade.php
@@ -115,7 +115,7 @@
 
                   @if ($model->manufacturer->url)
                       <li>
-                          <i class="fa fa-globe"></i> <a href="{{ $model->manufacturer->url }}">{{ $model->manufacturer->url }}</a>
+                          <i class="fas fa-globe-americas"></i> <a href="{{ $model->manufacturer->url }}">{{ $model->manufacturer->url }}</a>
                       </li>
                   @endif
 
@@ -135,7 +135,7 @@
 
                   @if ($model->manufacturer->support_email)
                       <li>
-                          <i class="fa fa-envelope"></i> <a href="mailto:{{ $model->manufacturer->support_email }}">{{ $model->manufacturer->support_email }}</a>
+                          <i class="far fa-envelope"></i> <a href="mailto:{{ $model->manufacturer->support_email }}">{{ $model->manufacturer->support_email }}</a>
                       </li>
                   @endif
                 @endif
diff --git a/resources/views/suppliers/view.blade.php b/resources/views/suppliers/view.blade.php
index 8f2c9166a..914c2d832 100755
--- a/resources/views/suppliers/view.blade.php
+++ b/resources/views/suppliers/view.blade.php
@@ -251,7 +251,7 @@
 
       @if ($supplier->url)
       <li>
-        <i class="fa fa-globe"></i>
+        <i class="fas fa-globe-americas"></i>
         <a href="{{ $supplier->url }}" target="_new">{{ $supplier->url }}</a>
       </li>
       @endif