Merge remote-tracking branch 'origin/develop'

package-lock.json

@@ -1329,10 +1329,9 @@
             "dev": true
         },
         "@fortawesome/fontawesome-free": {
-            "version": "5.15.4",
-            "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.4.tgz",
-            "integrity": "sha512-eYm8vijH/hpzr/6/1CJ/V/Eb1xQFW2nnUKArb3z+yUWv7HTwj6M7SP957oMjfZjAHU6qpoNc2wQvIxBLWYa/Jg==",
-            "dev": true
+            "version": "6.1.1",
+            "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.1.1.tgz",
+            "integrity": "sha512-J/3yg2AIXc9wznaVqpHVX3Wa5jwKovVF0AMYSnbmcXTiL3PpRPfF58pzWucCwEiCJBp+hCNRLWClTomD8SseKg=="
         },
         "@jridgewell/gen-mapping": {
             "version": "0.1.1",
@@ -15417,7 +15416,7 @@
         "image-size": {
             "version": "0.5.5",
             "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz",
-            "integrity": "sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=",
+            "integrity": "sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==",
             "optional": true
         },
         "imagemin": {
@@ -18260,7 +18259,7 @@
         "prr": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
-            "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
+            "integrity": "sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==",
             "optional": true
         },
         "pseudomap": {

package.json

@@ -13,7 +13,6 @@
         "node": ">=0.12"
     },
     "devDependencies": {
-        "@fortawesome/fontawesome-free": "^5.15.4",
         "axios": "^0.27.2",
         "babel-preset-latest": "^6.24.1",
         "jquery": "<3.6.0",
@@ -25,6 +24,7 @@
         "vue-template-compiler": "2.4.4"
     },
     "dependencies": {
+        "@fortawesome/fontawesome-free": "^6.1.1",
         "acorn": "^8.7.0",
         "acorn-import-assertions": "^1.8.0",
         "admin-lte": "^2.4.18",
@@ -38,7 +38,6 @@
         "chart.js": "^2.9.4",
         "css-loader": "^3.6.0",
         "ekko-lightbox": "^5.1.1",
-        "font-awesome": "^4.7.0",
         "icheck": "^1.0.2",
         "imagemin": "^5.3.1",
         "jquery-form-validator": "^2.3.79",

public/mix-manifest.json

@@ -1,45 +1,53 @@
 {
-    "/js/build/app.js": "/js/build/app.js?id=1218df365997eb1079ea543e967cb778",
-    "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=940da5c039a1f104654e127e0d43b801",
-    "/css/build/overrides.css": "/css/build/overrides.css?id=3ceb3005e82edf509bb14910fa522b60",
-    "/css/build/app.css": "/css/build/app.css?id=0fa5fa8923472c9b63c86136f4558fb5",
-    "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=f25c77ed07053646a42e9c19923d24fa",
-    "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=083eab0a6e1062adfe24ee21a829e6c3",
-    "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=43789a18d950ebfc2bdac669bbd55160",
-    "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=f67e818ef24353945aa8abd0806bcdd0",
-    "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=0a733a5644b57ea25698223e025a12c6",
-    "/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=bcacab67c45f81a06e6f84c4872cfd84",
-    "/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css?id=d3841de28dfd9af85b7413eceb7a4d6d",
-    "/css/dist/skins/skin-purple.css": "/css/dist/skins/skin-purple.css?id=06ff5fe6930e974a9d13794196fcf48a",
-    "/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css?id=124e298c233b61f4f9ba725a93fc0e4c",
-    "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=4d4b1c24e99c2afd417bd457bc396475",
-    "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=c3033f52259f665b0e46b9c88543035a",
-    "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=c93c7ecba14e699417ce89902b94539f",
-    "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=af9b811e81b591789d1155c0d4ed42af",
-    "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=fc501683e0cb04a8717593610d215baf",
-    "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=476ccb37fe487f4d29ebfb49c198e311",
-    "/css/dist/all.css": "/css/dist/all.css?id=f6c3efa753db7c1c5583905bd629e2a1",
+    "/js/build/app.js": "/js/build/app.js?id=8b75d505c1bee38e15573e394b96f249",
+    "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=71977934351d63b126c6b3573baf3349",
+    "/css/build/overrides.css": "/css/build/overrides.css?id=850778acc6fa9f9ba0c399c026608d4d",
+    "/css/build/app.css": "/css/build/app.css?id=d7704c35fe632144a1c62703a7441a1f",
+    "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=dc383f8560a8d4adb51d44fb4043e03b",
+    "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=0715caf11a30f0756768c093ee3a5a8f",
+    "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=0d8fd1ee0653f7255619590d4abf3c22",
+    "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=210b322b1c0f4ecf11d4cc3a29d64556",
+    "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=ef5186a585936733a580be47cb259f82",
+    "/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=47021aa27f4112d4abb6ba9ca371ded3",
+    "/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css?id=9e6a13c999dc9fcf1466c19564c3bfa4",
+    "/css/dist/skins/skin-purple.css": "/css/dist/skins/skin-purple.css?id=73bb57f917efb32895488cef3d92b42a",
+    "/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css?id=e9b898cc86d0d719cb737ed4ef99473f",
+    "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=d23457882fd51f0456d4e0bd644f3fd4",
+    "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=924fd5e1d5d41ffc483841a628eb9c58",
+    "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=ad668346fb0a97b86491ce33d995c9b6",
+    "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=407f83d58689706f303a83e195f6c041",
+    "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=8e538625ebd4b8096e150d1aa483547b",
+    "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=c17879493dcd86dbb6c1701082bec9f7",
+    "/css/dist/all.css": "/css/dist/all.css?id=e5e18ccc7a28de1f382df038259009e0",
     "/css/blue.png": "/css/blue.png?id=e83a6c29e04fe851f2122815b2e4b150",
     "/css/blue@2x.png": "/css/blue@2x.png?id=51135dd4d24f88f5de0b2414bd51dac5",
     "/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced1cf5f13147f7",
     "/css/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced1cf5f13147f7",
+    "/css/webfonts/fa-brands-400.ttf": "/css/webfonts/fa-brands-400.ttf?id=271b60d8619482f8168b10c9d9bd75c6",
+    "/css/webfonts/fa-brands-400.woff2": "/css/webfonts/fa-brands-400.woff2?id=0b5984039692449bafd77ec6b2a94ffd",
+    "/css/webfonts/fa-regular-400.ttf": "/css/webfonts/fa-regular-400.ttf?id=d6bdba38c7717d610a44aa6aabf53cee",
+    "/css/webfonts/fa-regular-400.woff2": "/css/webfonts/fa-regular-400.woff2?id=cb54ac147c84c164d0a83fcd06f9e9ad",
+    "/css/webfonts/fa-solid-900.ttf": "/css/webfonts/fa-solid-900.ttf?id=049ce078cc76ac740d55085e27008d02",
+    "/css/webfonts/fa-solid-900.woff2": "/css/webfonts/fa-solid-900.woff2?id=d0d39acc7b54ab04c9e1af5798a0f816",
+    "/css/webfonts/fa-v4compatibility.ttf": "/css/webfonts/fa-v4compatibility.ttf?id=12c356ac726e8e2bc1c28ce1a04ab4d7",
+    "/css/webfonts/fa-v4compatibility.woff2": "/css/webfonts/fa-v4compatibility.woff2?id=5bb25ae8c661619d1b32c029e4048cb6",
     "/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=ee4896df8b8f008ce73a9a0c2549aefd",
     "/js/build/vendor.js": "/js/build/vendor.js?id=47ecbb4bb3b0e02315f391caadbdf971",
     "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=14d9a2affec7b066d20fcba2e6e67ad2",
-    "/js/dist/all.js": "/js/dist/all.js?id=e25ec49ad10591b90f1aa358d1cc1805",
-    "/css/dist/skins/skin-green.min.css": "/css/dist/skins/skin-green.min.css?id=af9b811e81b591789d1155c0d4ed42af",
-    "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=c93c7ecba14e699417ce89902b94539f",
-    "/css/dist/skins/skin-black.min.css": "/css/dist/skins/skin-black.min.css?id=c3033f52259f665b0e46b9c88543035a",
-    "/css/dist/skins/skin-black-dark.min.css": "/css/dist/skins/skin-black-dark.min.css?id=4d4b1c24e99c2afd417bd457bc396475",
-    "/css/dist/skins/skin-blue.min.css": "/css/dist/skins/skin-blue.min.css?id=940da5c039a1f104654e127e0d43b801",
-    "/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=f67e818ef24353945aa8abd0806bcdd0",
-    "/css/dist/skins/skin-yellow.min.css": "/css/dist/skins/skin-yellow.min.css?id=bcacab67c45f81a06e6f84c4872cfd84",
-    "/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=0a733a5644b57ea25698223e025a12c6",
-    "/css/dist/skins/skin-red.min.css": "/css/dist/skins/skin-red.min.css?id=476ccb37fe487f4d29ebfb49c198e311",
-    "/css/dist/skins/skin-red-dark.min.css": "/css/dist/skins/skin-red-dark.min.css?id=124e298c233b61f4f9ba725a93fc0e4c",
-    "/css/dist/skins/skin-purple.min.css": "/css/dist/skins/skin-purple.min.css?id=06ff5fe6930e974a9d13794196fcf48a",
-    "/css/dist/skins/skin-purple-dark.min.css": "/css/dist/skins/skin-purple-dark.min.css?id=d3841de28dfd9af85b7413eceb7a4d6d",
-    "/css/dist/skins/skin-orange.min.css": "/css/dist/skins/skin-orange.min.css?id=083eab0a6e1062adfe24ee21a829e6c3",
-    "/css/dist/skins/skin-orange-dark.min.css": "/css/dist/skins/skin-orange-dark.min.css?id=43789a18d950ebfc2bdac669bbd55160",
-    "/css/dist/skins/skin-contrast.min.css": "/css/dist/skins/skin-contrast.min.css?id=fc501683e0cb04a8717593610d215baf"
+    "/js/dist/all.js": "/js/dist/all.js?id=448ec9994dee0c281e8b4bc59fd4cfc6",
+    "/css/dist/skins/skin-green.min.css": "/css/dist/skins/skin-green.min.css?id=407f83d58689706f303a83e195f6c041",
+    "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=ad668346fb0a97b86491ce33d995c9b6",
+    "/css/dist/skins/skin-black.min.css": "/css/dist/skins/skin-black.min.css?id=924fd5e1d5d41ffc483841a628eb9c58",
+    "/css/dist/skins/skin-black-dark.min.css": "/css/dist/skins/skin-black-dark.min.css?id=d23457882fd51f0456d4e0bd644f3fd4",
+    "/css/dist/skins/skin-blue.min.css": "/css/dist/skins/skin-blue.min.css?id=71977934351d63b126c6b3573baf3349",
+    "/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=210b322b1c0f4ecf11d4cc3a29d64556",
+    "/css/dist/skins/skin-yellow.min.css": "/css/dist/skins/skin-yellow.min.css?id=47021aa27f4112d4abb6ba9ca371ded3",
+    "/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=ef5186a585936733a580be47cb259f82",
+    "/css/dist/skins/skin-red.min.css": "/css/dist/skins/skin-red.min.css?id=c17879493dcd86dbb6c1701082bec9f7",
+    "/css/dist/skins/skin-red-dark.min.css": "/css/dist/skins/skin-red-dark.min.css?id=e9b898cc86d0d719cb737ed4ef99473f",
+    "/css/dist/skins/skin-purple.min.css": "/css/dist/skins/skin-purple.min.css?id=73bb57f917efb32895488cef3d92b42a",
+    "/css/dist/skins/skin-purple-dark.min.css": "/css/dist/skins/skin-purple-dark.min.css?id=9e6a13c999dc9fcf1466c19564c3bfa4",
+    "/css/dist/skins/skin-orange.min.css": "/css/dist/skins/skin-orange.min.css?id=0715caf11a30f0756768c093ee3a5a8f",
+    "/css/dist/skins/skin-orange-dark.min.css": "/css/dist/skins/skin-orange-dark.min.css?id=0d8fd1ee0653f7255619590d4abf3c22",
+    "/css/dist/skins/skin-contrast.min.css": "/css/dist/skins/skin-contrast.min.css?id=8e538625ebd4b8096e150d1aa483547b"
 }

resources/views/layouts/default.blade.php

@@ -132,7 +132,7 @@
                   @can('index', \App\Models\Asset::class)
                   <li aria-hidden="true"{!! (Request::is('hardware*') ? ' class="active"' : '') !!} tabindex="-1">
                       <a href="{{ url('hardware') }}" tabindex="-1">
-                          <i class="fas fa-barcode" aria-hidden="true"></i>
+                          <i class="fas fa-barcode fa-fw" aria-hidden="true"></i>
                           <span class="sr-only">{{ trans('general.assets') }}</span>
                       </a>
                   </li>
@@ -140,7 +140,7 @@
                   @can('view', \App\Models\License::class)
                   <li aria-hidden="true"{!! (Request::is('licenses*') ? ' class="active"' : '') !!} tabindex="-1">
                       <a href="{{ route('licenses.index') }}" tabindex="-1">
-                          <i class="far fa-save"></i>
+                          <i class="far fa-save fa-fw"></i>
                           <span class="sr-only">{{ trans('general.licenses') }}</span>
                       </a>
                   </li>
@@ -148,7 +148,7 @@
                   @can('index', \App\Models\Accessory::class)
                   <li aria-hidden="true"{!! (Request::is('accessories*') ? ' class="active"' : '') !!} tabindex="-1">
                       <a href="{{ route('accessories.index') }}" tabindex="-1">
-                          <i class="far fa-keyboard"></i>
+                          <i class="far fa-keyboard fa-fw"></i>
                           <span class="sr-only">{{ trans('general.accessories') }}</span>
                       </a>
                   </li>
@@ -156,7 +156,7 @@
                   @can('index', \App\Models\Consumable::class)
                   <li aria-hidden="true"{!! (Request::is('consumables*') ? ' class="active"' : '') !!}>
                       <a href="{{ url('consumables') }}" tabindex="-1">
-                          <i class="fas fa-tint"></i>
+                          <i class="fas fa-tint fa-fw"></i>
                           <span class="sr-only">{{ trans('general.consumables') }}</span>
                       </a>
                   </li>
@@ -164,7 +164,7 @@
                   @can('view', \App\Models\Component::class)
                   <li aria-hidden="true"{!! (Request::is('components*') ? ' class="active"' : '') !!}>
                       <a href="{{ route('components.index') }}" tabindex="-1">
-                          <i class="far fa-hdd"></i>
+                          <i class="far fa-hdd fa-fw"></i>
                           <span class="sr-only">{{ trans('general.components') }}</span>
                       </a>
                   </li>
@@ -337,7 +337,7 @@
                      </li>
                      <li>
                          <a href="{{ route('account.password.index') }}">
-                             <i class="fa fa-asterisk fa-fw" aria-hidden="true"></i>
+                             <i class="fa-solid fa-asterisk fa-fw" aria-hidden="true"></i>
                              {{ trans('general.changepassword') }}
                          </a>
                      </li>
@@ -347,7 +347,7 @@
                      @can('self.api')
                      <li>
                          <a href="{{ route('user.api') }}">
-                             <i class="fas fa-user-secret fa-fw" aria-hidden="true"></i> {{ trans('general.manage_api_keys') }}
+                             <i class="fa-solid fa-user-secret fa-fw" aria-hidden="true"></i></i> {{ trans('general.manage_api_keys') }}
                          </a>
                      </li>
                      @endcan
@@ -395,20 +395,20 @@
             @can('admin')
             <li {!! (\Request::route()->getName()=='home' ? ' class="active"' : '') !!} class="firstnav">
               <a href="{{ route('home') }}">
-                <i class="fas fa-tachometer-alt" aria-hidden="true"></i> <span>{{ trans('general.dashboard') }}</span>
+                <i class="fas fa-tachometer-alt fa-fw" aria-hidden="true"></i> <span>{{ trans('general.dashboard') }}</span>
               </a>
             </li>
             @endcan
             @can('index', \App\Models\Asset::class)
             <li class="treeview{{ (Request::is('hardware*') ? ' active' : '') }}">
-                <a href="#"><i class="fas fa-barcode" aria-hidden="true"></i>
+                <a href="#"><i class="fas fa-barcode fa-fw" aria-hidden="true"></i>
                   <span>{{ trans('general.assets') }}</span>
                   <i class="fa fa-angle-left pull-right"></i>
                 </a>
                 <ul class="treeview-menu">
                   <li>
                       <a href="{{ url('hardware') }}">
-                          <i class="far fa-circle text-grey" aria-hidden="true"></i>
+                          <i class="far fa-circle text-grey fa-fw" aria-hidden="true"></i>
                         {{ trans('general.list_all') }}
                     </a>
                   </li>
@@ -417,7 +417,7 @@
                     @if (count($status_navs) > 0)
                         @foreach ($status_navs as $status_nav)
                             <li><a href="{{ route('statuslabels.show', ['statuslabel' => $status_nav->id]) }}">
-                                <i class="fas fa-circle text-grey" aria-hidden="true"></i>
+                                <i class="fas fa-circle text-grey fa-fw" aria-hidden="true"></i>
                                  {{ $status_nav->name }} ({{ $status_nav->asset_count }})</a></li>
                         @endforeach
                     @endif
@@ -425,7 +425,7 @@
 
                   <li{!! (Request::query('status') == 'Deployed' ? ' class="active"' : '') !!}>
                     <a href="{{ url('hardware?status=Deployed') }}">
-                        <i class="far fa-circle text-blue"></i>
+                        <i class="far fa-circle text-blue fa-fw"></i>
                         {{ trans('general.all') }}
                         {{ trans('general.deployed') }}
                         ({{ (isset($total_deployed_sidebar)) ? $total_deployed_sidebar : '' }})
@@ -433,31 +433,31 @@
                   </li>
                   <li{!! (Request::query('status') == 'RTD' ? ' class="active"' : '') !!}>
                     <a href="{{ url('hardware?status=RTD') }}">
-                        <i class="far fa-circle text-green"></i>
+                        <i class="far fa-circle text-green fa-fw"></i>
                         {{ trans('general.all') }}
                         {{ trans('general.ready_to_deploy') }}
                         ({{ (isset($total_rtd_sidebar)) ? $total_rtd_sidebar : '' }})
                     </a>
                   </li>
-                  <li{!! (Request::query('status') == 'Pending' ? ' class="active"' : '') !!}><a href="{{ url('hardware?status=Pending') }}"><i class="far fa-circle text-orange"></i>
+                  <li{!! (Request::query('status') == 'Pending' ? ' class="active"' : '') !!}><a href="{{ url('hardware?status=Pending') }}"><i class="far fa-circle text-orange fa-fw"></i>
                           {{ trans('general.all') }}
                           {{ trans('general.pending') }}
                           ({{ (isset($total_pending_sidebar)) ? $total_pending_sidebar : '' }})
                       </a>
                   </li>
-                  <li{!! (Request::query('status') == 'Undeployable' ? ' class="active"' : '') !!} ><a href="{{ url('hardware?status=Undeployable') }}"><i class="fas fa-times text-red"></i>
+                  <li{!! (Request::query('status') == 'Undeployable' ? ' class="active"' : '') !!} ><a href="{{ url('hardware?status=Undeployable') }}"><i class="fas fa-times text-red fa-fw"></i>
                           {{ trans('general.all') }}
                           {{ trans('general.undeployable') }}
                           ({{ (isset($total_undeployable_sidebar)) ? $total_undeployable_sidebar : '' }})
                       </a>
                   </li>
-                  <li{!! (Request::query('status') == 'Archived' ? ' class="active"' : '') !!}><a href="{{ url('hardware?status=Archived') }}"><i class="fas fa-times text-red"></i>
+                  <li{!! (Request::query('status') == 'Archived' ? ' class="active"' : '') !!}><a href="{{ url('hardware?status=Archived') }}"><i class="fas fa-times text-red fa-fw"></i>
                           {{ trans('general.all') }}
                           {{ trans('admin/hardware/general.archived') }}
                           ({{ (isset($total_archived_sidebar)) ? $total_archived_sidebar : '' }})
                           </a>
                   </li>
-                    <li{!! (Request::query('status') == 'Requestable' ? ' class="active"' : '') !!}><a href="{{ url('hardware?status=Requestable') }}"><i class="fas fa-check text-blue"></i>
+                    <li{!! (Request::query('status') == 'Requestable' ? ' class="active"' : '') !!}><a href="{{ url('hardware?status=Requestable') }}"><i class="fas fa-check text-blue fa-fw"></i>
                         {{ trans('admin/hardware/general.requestable') }}
                         </a>
                     </li>
@@ -465,12 +465,12 @@
                     @can('audit', \App\Models\Asset::class)
                         <li{!! (Request::is('hardware/audit/due') ? ' class="active"' : '') !!}>
                             <a href="{{ route('assets.audit.due') }}">
-                                <i class="fas fa-history text-yellow"></i> {{ trans('general.audit_due') }}
+                                <i class="fas fa-history text-yellow fa-fw"></i> {{ trans('general.audit_due') }}
                             </a>
                         </li>
                         <li{!! (Request::is('hardware/audit/overdue') ? ' class="active"' : '') !!}>
                             <a href="{{ route('assets.audit.overdue') }}">
-                                <i class="fas fa-exclamation-triangle text-red"></i> {{ trans('general.audit_overdue') }}
+                                <i class="fas fa-exclamation-triangle text-red fa-fw"></i> {{ trans('general.audit_overdue') }}
                             </a>
                         </li>
                     @endcan
@@ -528,7 +528,7 @@
               @can('view', \App\Models\License::class)
               <li{!! (Request::is('licenses*') ? ' class="active"' : '') !!}>
                   <a href="{{ route('licenses.index') }}">
-                    <i class="far fa-save"></i>
+                    <i class="far fa-save fa-fw"></i>
                     <span>{{ trans('general.licenses') }}</span>
                   </a>
               </li>
@@ -536,7 +536,7 @@
               @can('index', \App\Models\Accessory::class)
               <li{!! (Request::is('accessories*') ? ' class="active"' : '') !!}>
                 <a href="{{ route('accessories.index') }}">
-                  <i class="far fa-keyboard"></i>
+                  <i class="far fa-keyboard fa-fw"></i>
                   <span>{{ trans('general.accessories') }}</span>
                 </a>
               </li>
@@ -544,7 +544,7 @@
               @can('view', \App\Models\Consumable::class)
             <li{!! (Request::is('consumables*') ? ' class="active"' : '') !!}>
                 <a href="{{ url('consumables') }}">
-                  <i class="fas fa-tint"></i>
+                  <i class="fas fa-tint fa-fw"></i>
                   <span>{{ trans('general.consumables') }}</span>
                 </a>
             </li>
@@ -552,7 +552,7 @@
              @can('view', \App\Models\Component::class)
             <li{!! (Request::is('components*') ? ' class="active"' : '') !!}>
                 <a href="{{ route('components.index') }}">
-                  <i class="far fa-hdd"></i>
+                  <i class="far fa-hdd fa-fw"></i>
                   <span>{{ trans('general.components') }}</span>
                 </a>
             </li>
@@ -560,7 +560,7 @@
             @can('view', \App\Models\PredefinedKit::class)
                 <li{!! (Request::is('kits') ? ' class="active"' : '') !!}>
                     <a href="{{ route('kits.index') }}">
-                        <i class="fa fa-object-group"></i>
+                        <i class="fa fa-object-group fa-fw"></i>
                         <span>{{ trans('general.kits') }}</span>
                     </a>
                 </li>
@@ -569,7 +569,7 @@
             @can('view', \App\Models\User::class)
             <li{!! (Request::is('users*') ? ' class="active"' : '') !!}>
                   <a href="{{ route('users.index') }}">
-                      <i class="fas fa-users"></i>
+                      <i class="fas fa-users fa-fw"></i>
                       <span>{{ trans('general.people') }}</span>
                   </a>
             </li>
@@ -577,7 +577,7 @@
             @can('import')
                 <li{!! (Request::is('import/*') ? ' class="active"' : '') !!}>
                     <a href="{{ route('imports.index') }}">
-                        <i class="fas fa-cloud-download-alt"></i>
+                        <i class="fas fa-cloud-download-alt fa-fw"></i>
                         <span>{{ trans('general.import') }}</span>
                     </a>
                 </li>
@@ -585,7 +585,7 @@
 
             @can('backend.interact')
                 <li class="treeview {!! in_array(Request::route()->getName(),App\Helpers\Helper::SettingUrls()) ? ' active': '' !!}">
-                    <a href="#" id="settings" class="">
+                    <a href="#" id="settings">
                         <i class="fas fa-cog" aria-hidden="true"></i>
                         <span>{{ trans('general.settings') }}</span>
                         <i class="fa fa-angle-left pull-right"></i>
@@ -678,7 +678,7 @@
             @can('reports.view')
             <li class="treeview{{ (Request::is('reports*') ? ' active' : '') }}">
                 <a href="#"  class="dropdown-toggle">
-                    <i class="fas fa-chart-bar"></i>
+                    <i class="fas fa-chart-bar fa-fw"></i>
                     <span>{{ trans('general.reports') }}</span>
                     <i class="fa fa-angle-left pull-right"></i>
                 </a>
@@ -730,7 +730,7 @@
             @can('viewRequestable', \App\Models\Asset::class)
             <li{!! (Request::is('account/requestable-assets') ? ' class="active"' : '') !!}>
             <a href="{{ route('requestable-assets') }}">
-            <i class="fa fa-laptop"></i>
+            <i class="fa fa-laptop fa-fw"></i>
             <span>{{ trans('admin/hardware/general.requestable') }}</span>
             </a>
             </li>

webpack.mix.js

@@ -13,8 +13,9 @@ mix
   .less("./resources/assets/less/overrides.less", "css/build")
   .styles(
     [
-      "./resources/assets/css/font-awesome/all.css",
+
       "./node_modules/bootstrap/dist/css/bootstrap.css",
+      "./node_modules/@fortawesome/fontawesome-free/css/all.css",
       "./public/css/build/AdminLTE.css",
       "./node_modules/jquery-ui-bundle/jquery-ui.css",
       "./node_modules/admin-lte/plugins/iCheck/minimal/blue.css",
@@ -48,6 +49,12 @@ mix
   .copy("./resources/assets/css/signature-pad.css", "./public/css/dist")
   .minify("./public/css/dist/signature-pad.css");
 
+/**
+ * Copy, minify and version signature-pad.css
+ */
+mix
+    .copy("./node_modules/@fortawesome/fontawesome-free/webfonts", "./public/css/webfonts")
+
 // Combine main SnipeIT JS files
 mix
   .js(