diff --git a/.all-contributorsrc b/.all-contributorsrc
index 690b8e8cc8..43ffa39e88 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -2720,6 +2720,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "BasO12",
+      "name": "BasO12",
+      "avatar_url": "https://avatars.githubusercontent.com/u/94169344?v=4",
+      "profile": "https://github.com/BasO12",
+      "contributions": [
+        "code"
+      ]
     }
   ]
 }
diff --git a/README.md b/README.md
index 3b0029c711..c387a9bf3a 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 ![Build Status](https://app.chipperci.com/projects/0e5f8979-31eb-4ee6-9abf-050b76ab0383/status/master) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/snipe-it/localized.svg)](https://crowdin.com/project/snipe-it) [![Docker Pulls](https://img.shields.io/docker/pulls/snipe/snipe-it.svg)](https://hub.docker.com/r/snipe/snipe-it/) [![Twitter Follow](https://img.shields.io/twitter/follow/snipeitapp.svg?style=social)](https://twitter.com/snipeitapp)  [![Codacy Badge](https://api.codacy.com/project/badge/Grade/553ce52037fc43ea99149785afcfe641)](https://www.codacy.com/app/snipe/snipe-it?utm_source=github.com&utm_medium=referral&utm_content=snipe/snipe-it&utm_campaign=Badge_Grade)
-[![All Contributors](https://img.shields.io/badge/all_contributors-299-orange.svg?style=flat-square)](#contributors) [![Discord](https://badgen.net/badge/icon/discord?icon=discord&label)](https://discord.gg/yZFtShAcKk) [![huntr](https://cdn.huntr.dev/huntr_security_badge_mono.svg)](https://huntr.dev)
+[![All Contributors](https://img.shields.io/badge/all_contributors-300-orange.svg?style=flat-square)](#contributors) [![Discord](https://badgen.net/badge/icon/discord?icon=discord&label)](https://discord.gg/yZFtShAcKk) [![huntr](https://cdn.huntr.dev/huntr_security_badge_mono.svg)](https://huntr.dev)
 
 ## Snipe-IT - Open Source Asset Management System
 
@@ -137,7 +137,7 @@ Thanks goes to all of these wonderful people ([emoji key](https://github.com/ken
 | [<img src="https://avatars.githubusercontent.com/u/1911435?v=4" width="110px;"/><br /><sub>Adam</sub>](http://www.aboutcher.co.uk)<br />[💻](https://github.com/snipe/snipe-it/commits?author=adamboutcher "Code") | [<img src="https://avatars.githubusercontent.com/u/16104273?v=4" width="110px;"/><br /><sub>Ian</sub>](https://snksrv.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sneak-it "Code") | [<img src="https://avatars.githubusercontent.com/u/4023909?v=4" width="110px;"/><br /><sub>Shao Yu-Lung (Allen)</sub>](http://blog.bestlong.idv.tw/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=bestlong "Code") | [<img src="https://avatars.githubusercontent.com/u/76475453?v=4" width="110px;"/><br /><sub>Haxatron</sub>](https://github.com/Haxatron)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Haxatron "Code") | [<img src="https://avatars.githubusercontent.com/u/88776392?v=4" width="110px;"/><br /><sub>PlaneNuts</sub>](https://github.com/PlaneNuts)<br />[💻](https://github.com/snipe/snipe-it/commits?author=PlaneNuts "Code") | [<img src="https://avatars.githubusercontent.com/u/3842948?v=4" width="110px;"/><br /><sub>Bradley Coudriet</sub>](http://bjcpgd.cias.rit.edu)<br />[💻](https://github.com/snipe/snipe-it/commits?author=exula "Code") | [<img src="https://avatars.githubusercontent.com/u/21966173?v=4" width="110px;"/><br /><sub>Dalton Durst</sub>](https://daltondur.st)<br />[💻](https://github.com/snipe/snipe-it/commits?author=UniversalSuperBox "Code") |
 | [<img src="https://avatars.githubusercontent.com/u/38761237?v=4" width="110px;"/><br /><sub>Alex Janes</sub>](https://adagiohealth.org)<br />[💻](https://github.com/snipe/snipe-it/commits?author=adagioajanes "Code") | [<img src="https://avatars.githubusercontent.com/u/32387849?v=4" width="110px;"/><br /><sub>Nuraeil</sub>](https://github.com/nuraeil)<br />[💻](https://github.com/snipe/snipe-it/commits?author=nuraeil "Code") | [<img src="https://avatars.githubusercontent.com/u/48162670?v=4" width="110px;"/><br /><sub>TenOfTens</sub>](https://github.com/TenOfTens)<br />[💻](https://github.com/snipe/snipe-it/commits?author=TenOfTens "Code") | [<img src="https://avatars.githubusercontent.com/u/9415391?v=4" width="110px;"/><br /><sub>waffle</sub>](https://ditisjens.be/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=insert-waffle "Code") | [<img src="https://avatars.githubusercontent.com/u/19945501?v=4" width="110px;"/><br /><sub>Yevhenii Huzii</sub>](https://github.com/QveenSi)<br />[💻](https://github.com/snipe/snipe-it/commits?author=QveenSi "Code") | [<img src="https://avatars.githubusercontent.com/u/3839381?v=4" width="110px;"/><br /><sub>Achmad Fienan Rahardianto</sub>](https://github.com/veenone)<br />[💻](https://github.com/snipe/snipe-it/commits?author=veenone "Code") | [<img src="https://avatars.githubusercontent.com/u/19945501?v=4" width="110px;"/><br /><sub>Yevhenii Huzii</sub>](https://github.com/QveenSi)<br />[💻](https://github.com/snipe/snipe-it/commits?author=QveenSi "Code") |
 | [<img src="https://avatars.githubusercontent.com/u/97299851?v=4" width="110px;"/><br /><sub>Christian Weirich</sub>](https://github.com/chrisweirich)<br />[💻](https://github.com/snipe/snipe-it/commits?author=chrisweirich "Code") | [<img src="https://avatars.githubusercontent.com/u/1294403?v=4" width="110px;"/><br /><sub>denzfarid</sub>](https://github.com/denzfarid)<br /> | [<img src="https://avatars.githubusercontent.com/u/94018771?v=4" width="110px;"/><br /><sub>ntbutler-nbcs</sub>](https://github.com/ntbutler-nbcs)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ntbutler-nbcs "Code") | [<img src="https://avatars.githubusercontent.com/u/172697?v=4" width="110px;"/><br /><sub>Naveen</sub>](https://naveensrinivasan.dev)<br />[💻](https://github.com/snipe/snipe-it/commits?author=naveensrinivasan "Code") | [<img src="https://avatars.githubusercontent.com/u/55674383?v=4" width="110px;"/><br /><sub>Mike Roquemore</sub>](https://github.com/mikeroq)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mikeroq "Code") | [<img src="https://avatars.githubusercontent.com/u/7991086?v=4" width="110px;"/><br /><sub>Daniel Reeder</sub>](https://github.com/reederda)<br />[🌍](#translation-reederda "Translation") [🌍](#translation-reederda "Translation") [💻](https://github.com/snipe/snipe-it/commits?author=reederda "Code") | [<img src="https://avatars.githubusercontent.com/u/109422491?v=4" width="110px;"/><br /><sub>vickyjaura183</sub>](https://github.com/vickyjaura183)<br />[💻](https://github.com/snipe/snipe-it/commits?author=vickyjaura183 "Code") |
-| [<img src="https://avatars.githubusercontent.com/u/32363424?v=4" width="110px;"/><br /><sub>Peace</sub>](https://github.com/julian-piehl)<br />[💻](https://github.com/snipe/snipe-it/commits?author=julian-piehl "Code") | [<img src="https://avatars.githubusercontent.com/u/231528?v=4" width="110px;"/><br /><sub>Kyle Gordon</sub>](https://github.com/kylegordon)<br />[💻](https://github.com/snipe/snipe-it/commits?author=kylegordon "Code") | [<img src="https://avatars.githubusercontent.com/u/53009155?v=4" width="110px;"/><br /><sub>Katharina Drexel</sub>](http://www.bfh.ch)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sunflowerbofh "Code") | [<img src="https://avatars.githubusercontent.com/u/1931963?v=4" width="110px;"/><br /><sub>David Sferruzza</sub>](https://david.sferruzza.fr/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=dsferruzza "Code") | [<img src="https://avatars.githubusercontent.com/u/19511639?v=4" width="110px;"/><br /><sub>Rick Nelson</sub>](https://github.com/rnelsonee)<br />[💻](https://github.com/snipe/snipe-it/commits?author=rnelsonee "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/32363424?v=4" width="110px;"/><br /><sub>Peace</sub>](https://github.com/julian-piehl)<br />[💻](https://github.com/snipe/snipe-it/commits?author=julian-piehl "Code") | [<img src="https://avatars.githubusercontent.com/u/231528?v=4" width="110px;"/><br /><sub>Kyle Gordon</sub>](https://github.com/kylegordon)<br />[💻](https://github.com/snipe/snipe-it/commits?author=kylegordon "Code") | [<img src="https://avatars.githubusercontent.com/u/53009155?v=4" width="110px;"/><br /><sub>Katharina Drexel</sub>](http://www.bfh.ch)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sunflowerbofh "Code") | [<img src="https://avatars.githubusercontent.com/u/1931963?v=4" width="110px;"/><br /><sub>David Sferruzza</sub>](https://david.sferruzza.fr/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=dsferruzza "Code") | [<img src="https://avatars.githubusercontent.com/u/19511639?v=4" width="110px;"/><br /><sub>Rick Nelson</sub>](https://github.com/rnelsonee)<br />[💻](https://github.com/snipe/snipe-it/commits?author=rnelsonee "Code") | [<img src="https://avatars.githubusercontent.com/u/94169344?v=4" width="110px;"/><br /><sub>BasO12</sub>](https://github.com/BasO12)<br />[💻](https://github.com/snipe/snipe-it/commits?author=BasO12 "Code") |
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
 This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!
diff --git a/app/Importer/ItemImporter.php b/app/Importer/ItemImporter.php
index f015de04d9..d332200368 100644
--- a/app/Importer/ItemImporter.php
+++ b/app/Importer/ItemImporter.php
@@ -112,7 +112,7 @@ class ItemImporter extends Importer
             return $this->createOrFetchUser($row);
         }
 
-        if (strtolower($this->item['checkout_class']) === 'location') {
+        if (strtolower($this->item['checkout_class']) === 'location' && $this->findCsvMatch($row, 'checkout_location') != null ) {
             return Location::findOrFail($this->createOrFetchLocation($this->findCsvMatch($row, 'checkout_location')));
         }
 
diff --git a/package-lock.json b/package-lock.json
index d540eb9948..bbb8d24fd5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1329,9 +1329,9 @@
             "dev": true
         },
         "@fortawesome/fontawesome-free": {
-            "version": "6.1.2",
-            "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.1.2.tgz",
-            "integrity": "sha512-XwWADtfdSN73/udaFm+1mnGIj/ShDZNFMe/PRoqv3FhQ4GNI2PUN70yFTPsjq65Lw2C9i4TG5/hTbxXIXVCiqQ=="
+            "version": "6.2.0",
+            "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.2.0.tgz",
+            "integrity": "sha512-CNR7qRIfCwWHNN7FnKUniva94edPdyQzil/zCwk3v6k4R6rR2Fr8i4s3PM7n/lyfPA6Zfko9z5WDzFxG9SW1uQ=="
         },
         "@jridgewell/gen-mapping": {
             "version": "0.1.1",
diff --git a/package.json b/package.json
index cdf248ea88..7b25ea2d78 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
         "vue-template-compiler": "2.4.4"
     },
     "dependencies": {
-        "@fortawesome/fontawesome-free": "^6.1.2",
+        "@fortawesome/fontawesome-free": "^6.2.0",
         "acorn": "^8.8.0",
         "acorn-import-assertions": "^1.8.0",
         "admin-lte": "^2.4.18",
diff --git a/public/css/dist/all.css b/public/css/dist/all.css
index 0a23552513..737ba0b842 100644
Binary files a/public/css/dist/all.css and b/public/css/dist/all.css differ
diff --git a/public/css/dist/bootstrap-table.css b/public/css/dist/bootstrap-table.css
index 0cffbb53c4..b95d3d2b77 100644
Binary files a/public/css/dist/bootstrap-table.css and b/public/css/dist/bootstrap-table.css differ
diff --git a/public/css/dist/signature-pad.min.css b/public/css/dist/signature-pad.min.css
index 7065929572..218b9c2365 100644
Binary files a/public/css/dist/signature-pad.min.css and b/public/css/dist/signature-pad.min.css differ
diff --git a/public/css/dist/skins/skin-black-dark.min.css b/public/css/dist/skins/skin-black-dark.min.css
index ff26f479fa..d76dee7f27 100644
Binary files a/public/css/dist/skins/skin-black-dark.min.css and b/public/css/dist/skins/skin-black-dark.min.css differ
diff --git a/public/css/dist/skins/skin-black.min.css b/public/css/dist/skins/skin-black.min.css
index 5c6ab5b33c..9c04429365 100644
Binary files a/public/css/dist/skins/skin-black.min.css and b/public/css/dist/skins/skin-black.min.css differ
diff --git a/public/css/dist/skins/skin-blue-dark.min.css b/public/css/dist/skins/skin-blue-dark.min.css
index c9cc17f883..83a34c7205 100644
Binary files a/public/css/dist/skins/skin-blue-dark.min.css and b/public/css/dist/skins/skin-blue-dark.min.css differ
diff --git a/public/css/dist/skins/skin-blue.min.css b/public/css/dist/skins/skin-blue.min.css
index e256b963ef..2c95e55e3d 100644
Binary files a/public/css/dist/skins/skin-blue.min.css and b/public/css/dist/skins/skin-blue.min.css differ
diff --git a/public/css/dist/skins/skin-contrast.min.css b/public/css/dist/skins/skin-contrast.min.css
index 8119cf0697..a6dbe96048 100644
Binary files a/public/css/dist/skins/skin-contrast.min.css and b/public/css/dist/skins/skin-contrast.min.css differ
diff --git a/public/css/dist/skins/skin-green-dark.min.css b/public/css/dist/skins/skin-green-dark.min.css
index 76a6905966..1e78351e12 100644
Binary files a/public/css/dist/skins/skin-green-dark.min.css and b/public/css/dist/skins/skin-green-dark.min.css differ
diff --git a/public/css/dist/skins/skin-green.min.css b/public/css/dist/skins/skin-green.min.css
index 1804835d2f..bb79c7622b 100644
Binary files a/public/css/dist/skins/skin-green.min.css and b/public/css/dist/skins/skin-green.min.css differ
diff --git a/public/css/dist/skins/skin-orange-dark.min.css b/public/css/dist/skins/skin-orange-dark.min.css
index b6e69b2c78..4fc8fedf56 100644
Binary files a/public/css/dist/skins/skin-orange-dark.min.css and b/public/css/dist/skins/skin-orange-dark.min.css differ
diff --git a/public/css/dist/skins/skin-orange.min.css b/public/css/dist/skins/skin-orange.min.css
index 1f85a3fba2..17d6de7c35 100644
Binary files a/public/css/dist/skins/skin-orange.min.css and b/public/css/dist/skins/skin-orange.min.css differ
diff --git a/public/css/dist/skins/skin-purple-dark.min.css b/public/css/dist/skins/skin-purple-dark.min.css
index a2d5ab86b5..d7a9d2036d 100644
Binary files a/public/css/dist/skins/skin-purple-dark.min.css and b/public/css/dist/skins/skin-purple-dark.min.css differ
diff --git a/public/css/dist/skins/skin-purple.min.css b/public/css/dist/skins/skin-purple.min.css
index 42740d58c3..ebb5441582 100644
Binary files a/public/css/dist/skins/skin-purple.min.css and b/public/css/dist/skins/skin-purple.min.css differ
diff --git a/public/css/dist/skins/skin-red-dark.min.css b/public/css/dist/skins/skin-red-dark.min.css
index 63c1d35722..49ae16cff3 100644
Binary files a/public/css/dist/skins/skin-red-dark.min.css and b/public/css/dist/skins/skin-red-dark.min.css differ
diff --git a/public/css/dist/skins/skin-red.min.css b/public/css/dist/skins/skin-red.min.css
index 4c03bc7460..e76f831922 100644
Binary files a/public/css/dist/skins/skin-red.min.css and b/public/css/dist/skins/skin-red.min.css differ
diff --git a/public/css/dist/skins/skin-yellow-dark.min.css b/public/css/dist/skins/skin-yellow-dark.min.css
index 66ab4a38c2..66824328eb 100644
Binary files a/public/css/dist/skins/skin-yellow-dark.min.css and b/public/css/dist/skins/skin-yellow-dark.min.css differ
diff --git a/public/css/dist/skins/skin-yellow.min.css b/public/css/dist/skins/skin-yellow.min.css
index eb787b12ed..c64d603a7f 100644
Binary files a/public/css/dist/skins/skin-yellow.min.css and b/public/css/dist/skins/skin-yellow.min.css differ
diff --git a/public/css/webfonts/fa-brands-400.ttf b/public/css/webfonts/fa-brands-400.ttf
index 24ca8b17c0..502f3621e7 100644
Binary files a/public/css/webfonts/fa-brands-400.ttf and b/public/css/webfonts/fa-brands-400.ttf differ
diff --git a/public/css/webfonts/fa-brands-400.woff2 b/public/css/webfonts/fa-brands-400.woff2
index e67e5cd53e..d801b51f66 100644
Binary files a/public/css/webfonts/fa-brands-400.woff2 and b/public/css/webfonts/fa-brands-400.woff2 differ
diff --git a/public/css/webfonts/fa-regular-400.ttf b/public/css/webfonts/fa-regular-400.ttf
index c5ac009577..e0abe2710f 100644
Binary files a/public/css/webfonts/fa-regular-400.ttf and b/public/css/webfonts/fa-regular-400.ttf differ
diff --git a/public/css/webfonts/fa-regular-400.woff2 b/public/css/webfonts/fa-regular-400.woff2
index 7dca1d907f..d736e4b24c 100644
Binary files a/public/css/webfonts/fa-regular-400.woff2 and b/public/css/webfonts/fa-regular-400.woff2 differ
diff --git a/public/css/webfonts/fa-solid-900.ttf b/public/css/webfonts/fa-solid-900.ttf
index 43ba1cc7d9..13c9489771 100644
Binary files a/public/css/webfonts/fa-solid-900.ttf and b/public/css/webfonts/fa-solid-900.ttf differ
diff --git a/public/css/webfonts/fa-solid-900.woff2 b/public/css/webfonts/fa-solid-900.woff2
index 4a7f96652c..3516fdbe33 100644
Binary files a/public/css/webfonts/fa-solid-900.woff2 and b/public/css/webfonts/fa-solid-900.woff2 differ
diff --git a/public/css/webfonts/fa-v4compatibility.ttf b/public/css/webfonts/fa-v4compatibility.ttf
index 243bc25bd5..dc2981941d 100644
Binary files a/public/css/webfonts/fa-v4compatibility.ttf and b/public/css/webfonts/fa-v4compatibility.ttf differ
diff --git a/public/css/webfonts/fa-v4compatibility.woff2 b/public/css/webfonts/fa-v4compatibility.woff2
index e18a16d590..28d46b15ac 100644
Binary files a/public/css/webfonts/fa-v4compatibility.woff2 and b/public/css/webfonts/fa-v4compatibility.woff2 differ
diff --git a/public/js/build/app.js b/public/js/build/app.js
index 3d18f01709..0c20cb659f 100644
Binary files a/public/js/build/app.js and b/public/js/build/app.js differ
diff --git a/public/js/build/vendor.js b/public/js/build/vendor.js
index 38212409f3..b5ee42d9f6 100644
Binary files a/public/js/build/vendor.js and b/public/js/build/vendor.js differ
diff --git a/public/js/dist/all.js b/public/js/dist/all.js
index 2f5ae93d31..743a1aa4dd 100644
Binary files a/public/js/dist/all.js and b/public/js/dist/all.js differ
diff --git a/public/js/dist/bootstrap-table.js b/public/js/dist/bootstrap-table.js
index 2f4be303fa..0fafbbff9b 100644
Binary files a/public/js/dist/bootstrap-table.js and b/public/js/dist/bootstrap-table.js differ
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index c4bd9fa2e5..f7cb1e2f76 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -1,53 +1,21 @@
 {
-    "/js/build/app.js": "/js/build/app.js?id=9b2bd6c2e9b882c53969c66a9628a150",
-    "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=940da5c039a1f104654e127e0d43b801",
-    "/css/build/overrides.css": "/css/build/overrides.css?id=e99db816cf2ce6127a93c33b505ae695",
-    "/css/build/app.css": "/css/build/app.css?id=8868ecb38344d12bb011d1059f3a4617",
-    "/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=0245911190e2ff51f1710360b9fd25c4",
-    "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=b56c0c0c824d6c61b2ec83bc23633184",
-    "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=6f96d990312f7399988d14cb99d93165",
-    "/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=3a6f6c5794864b09096b6abf9760142b",
-    "/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=c2713ee362b046e0495fe162a981e860",
-    "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=832480a768184432af05d0109acfd7c8",
-    "/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=c13434c44fb6016396b1f7bac44e77d2",
-    "/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=07822def2d4cbcb1b693d32e11b6a55b",
-    "/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=4f2959c72d9818008ed9b5b7b1177278",
-    "/css/webfonts/fa-brands-400.woff2": "/css/webfonts/fa-brands-400.woff2?id=de432d58cf61dc5838aad876867d441f",
-    "/css/webfonts/fa-regular-400.ttf": "/css/webfonts/fa-regular-400.ttf?id=69ecc0f5d7d56f7a72474da8d50ffac1",
-    "/css/webfonts/fa-regular-400.woff2": "/css/webfonts/fa-regular-400.woff2?id=e0d2923e861cb6720d9aa02433644578",
-    "/css/webfonts/fa-solid-900.ttf": "/css/webfonts/fa-solid-900.ttf?id=acb2650bfb8cfc1c9a4b30c8d73dba7a",
-    "/css/webfonts/fa-solid-900.woff2": "/css/webfonts/fa-solid-900.woff2?id=4dc0559754cfbb32af44fd8d1f31f599",
-    "/css/webfonts/fa-v4compatibility.ttf": "/css/webfonts/fa-v4compatibility.ttf?id=8a8812a2a710e171b8253185b1d48689",
-    "/css/webfonts/fa-v4compatibility.woff2": "/css/webfonts/fa-v4compatibility.woff2?id=8a7e40131d14a91b5f91cc65912079d7",
-    "/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=065a8f4827b94b2f743fa1598ff2f196",
-    "/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=c13434c44fb6016396b1f7bac44e77d2",
-    "/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=832480a768184432af05d0109acfd7c8",
-    "/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=b56c0c0c824d6c61b2ec83bc23633184",
-    "/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=6f96d990312f7399988d14cb99d93165",
-    "/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=c2713ee362b046e0495fe162a981e860",
-    "/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=3a6f6c5794864b09096b6abf9760142b",
-    "/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=0245911190e2ff51f1710360b9fd25c4",
-    "/css/dist/skins/skin-contrast.min.css": "/css/dist/skins/skin-contrast.min.css?id=fc501683e0cb04a8717593610d215baf"
+    "/js/build/app.js": "/js/build/app.js",
+    "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css",
+    "/css/build/overrides.css": "/css/build/overrides.css",
+    "/css/build/app.css": "/css/build/app.css",
+    "/css/build/AdminLTE.css": "/css/build/AdminLTE.css",
+    "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css",
+    "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css",
+    "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css",
+    "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css",
+    "/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css",
+    "/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css",
+    "/css/dist/skins/skin-purple.css": "/css/dist/skins/skin-purple.css",
+    "/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css",
+    "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css",
+    "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css",
+    "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css",
+    "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css",
+    "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css",
+    "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css"
 }
diff --git a/resources/assets/js/components/importer/importer-file.vue b/resources/assets/js/components/importer/importer-file.vue
index a891b96fdb..f9455cf1ce 100644
--- a/resources/assets/js/components/importer/importer-file.vue
+++ b/resources/assets/js/components/importer/importer-file.vue
@@ -150,8 +150,6 @@
                     assets: [
                         {id: 'asset_tag', text: 'Asset Tag' },
                         {id: 'asset_model', text: 'Model Name' },
-                        {id: 'asset_notes', text: 'Asset Notes' },
-                        {id: 'model_notes', text: 'Model Notes' },
                         {id: 'checkout_class', text: 'Checkout Type' },
                         {id: 'checkout_location', text: 'Checkout Location' },
                         {id: 'image', text: 'Image Filename' },
@@ -174,7 +172,6 @@
                         {id: 'asset_tag', text: 'Assigned To Asset'},
                         {id: 'expiration_date', text: 'Expiration Date' },
                         {id: 'full_name', text: 'Full Name' },
-                        {id: 'notes', text: 'Notes' },
                         {id: 'license_email', text: 'Licensed To Email' },
                         {id: 'license_name', text: 'Licensed To Name' },
                         {id: 'notes', text: 'Notes' },
@@ -191,12 +188,10 @@
                         {id: 'manager_first_name', text: 'Manager First Name' },
                         {id: 'notes', text: 'Notes' },
                         {id: 'manager_last_name', text: 'Manager Last Name' },
-                        {id: 'notes', text: 'Notes' },
                         {id: 'activated', text: 'Activated' },
                         {id: 'address', text: 'Address' },
                         {id: 'city', text: 'City' },
                         {id: 'state', text: 'State' },
-                        {id: 'zip', text: 'ZIP' },
                         {id: 'country', text: 'Country' },
                         {id: 'zip', text: 'ZIP' },
 
diff --git a/resources/views/notifications.blade.php b/resources/views/notifications.blade.php
index c3830a939d..0935c28582 100755
--- a/resources/views/notifications.blade.php
+++ b/resources/views/notifications.blade.php
@@ -50,6 +50,9 @@
                         <li><b>{{ trans('general.asset_name') }} </b> {{ $asset->model->name }}</li>
                     @endisset
                     <li><b>{{ trans('general.asset_tag') }}</b> {{ $asset->asset_tag }}</li>
+		    @isset ($asset->notes)
+		    <li><b>{{ trans('general.notes') }}</b> {{ $asset->notes }}</li>
+		    @endisset
                 </ul>
 
             </div>
diff --git a/resources/views/notifications/markdown/upcoming-audits.blade.php b/resources/views/notifications/markdown/upcoming-audits.blade.php
index f7ccf556b1..e623941d25 100644
--- a/resources/views/notifications/markdown/upcoming-audits.blade.php
+++ b/resources/views/notifications/markdown/upcoming-audits.blade.php
@@ -3,8 +3,8 @@
 ### {{ trans_choice('mail.upcoming-audits', $assets->count(), ['count' => $assets->count(), 'threshold' => $threshold]) }}
 
 @component('mail::table')
-| |{{ trans('mail.name') }}|{{ trans('general.last_audit') }}|{{ trans('general.next_audit_date') }}|{{ trans('mail.Days') }}|{{ trans('mail.supplier') }} | {{ trans('mail.assigned_to') }}
-|-|:------------- |:-------------|:---------|:---------|:---------|:---------|
+| |{{ trans('mail.name') }}|{{ trans('general.last_audit') }}|{{ trans('general.next_audit_date') }}|{{ trans('mail.Days') }}|{{ trans('mail.supplier') }} | {{ trans('mail.assigned_to') }}|{{ trans('general.notes') }}
+|-|:------------- |:-------------|:---------|:---------|:---------|:---------|:---------|
 @foreach ($assets as $asset)
 @php
 $next_audit_date = Helper::getFormattedDateObject($asset->next_audit_date, 'date', false);
@@ -12,7 +12,7 @@ $last_audit_date = Helper::getFormattedDateObject($asset->last_audit_date, 'date
 $diff = Carbon::parse(Carbon::now())->diffInDays($asset->next_audit_date, false);
 $icon = ($diff <= 7) ? '🚨' : (($diff <= 14) ? '⚠️' : ' ');
 @endphp
-|{{ $icon }}| [{{ $asset->present()->name }}]({{ route('hardware.show', $asset->id) }}) | {{ $last_audit_date }}| {{ $next_audit_date }} | {{ $diff }}  | {{ ($asset->supplier ? e($asset->supplier->name) : '') }}|{{ ($asset->assignedTo ? $asset->assignedTo->present()->name() : '') }}
+|{{ $icon }}| [{{ $asset->present()->name }}]({{ route('hardware.show', $asset->id) }}) | {{ $last_audit_date }}| {{ $next_audit_date }} | {{ $diff }}  | {{ ($asset->supplier ? e($asset->supplier->name) : '') }}|{{ ($asset->assignedTo ? $asset->assignedTo->present()->name() : '') }}|{{ $asset->notes }}
 @endforeach
 @endcomponent