diff --git a/package.json b/package.json
index 746adb5..f461d8b 100644
--- a/package.json
+++ b/package.json
@@ -9,12 +9,16 @@
   ],
   "license": "GPL-3.0-or-later",
   "homepage": "https://github.com/mbirth/php-owntracks-recorder",
-  "keywords": ["owntracks", "latitude", "geolocation"],
+  "keywords": [
+    "owntracks",
+    "latitude",
+    "geolocation"
+  ],
   "private": true,
   "dependencies": {
+    "@fortawesome/fontawesome-free": "^5.3.1",
     "bootstrap": "^4.1.3",
     "coffeescript": "^2.3.2",
-    "font-awesome": "^4.7.0",
     "jquery": "^3.3.1",
     "js-cookie": "^2.2.0",
     "leaflet": "^1.3.4",
diff --git a/templates/partials/index_assets.mustache b/templates/partials/index_assets.mustache
index 6e9d66f..56b1d87 100644
--- a/templates/partials/index_assets.mustache
+++ b/templates/partials/index_assets.mustache
@@ -7,7 +7,7 @@
   <link rel="stylesheet" href="node_modules/bootstrap/dist/css/bootstrap-grid.min.css"/>
 
   <!-- Font Awesome -->
-  <link rel="stylesheet" href="node_modules/font-awesome/css/font-awesome.min.css"/>
+  <link rel="stylesheet" href="node_modules/@fortawesome/fontawesome-free/css/all.min.css"/>
 
   <!-- LEAFLET.JS !-->
   <script type="text/javascript" src="node_modules/leaflet/dist/leaflet.js"></script>
diff --git a/yarn.lock b/yarn.lock
old mode 100644
new mode 100755
index 9a93842..fac5a76
--- a/yarn.lock
+++ b/yarn.lock
@@ -12,11 +12,6 @@ coffeescript@^2.3.2:
   resolved "https://registry.yarnpkg.com/coffeescript/-/coffeescript-2.3.2.tgz#e854a7020dfe47b7cf4dd412042e32ef1e269810"
   integrity sha512-YObiFDoukx7qPBi/K0kUKyntEZDfBQiqs/DbrR1xzASKOBjGT7auD85/DiPeRr9k++lRj7l3uA9TNMLfyfcD/Q==
 
-font-awesome@^4.7.0:
-  version "4.7.0"
-  resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133"
-  integrity sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM=
-
 jquery@^3.3.1:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz#958ce29e81c9790f31be7792df5d4d95fc57fbca"