diff --git a/base_fontawesome/__manifest__.py b/base_fontawesome/__manifest__.py
index c8eef11e1..72edec338 100644
--- a/base_fontawesome/__manifest__.py
+++ b/base_fontawesome/__manifest__.py
@@ -5,7 +5,7 @@
 {
     "name": "Base Fontawesome",
     "summary": """Up to date Fontawesome resources.""",
-    "version": "15.0.5.15.4",
+    "version": "16.0.5.15.4",
     "license": "LGPL-3",
     "website": "https://github.com/OCA/server-tools",
     "author": "Camptocamp,Creu Blanca,Odoo Community Association (OCA)",
@@ -14,7 +14,7 @@
         "web.assets_common": [
             (
                 "replace",
-                "web/static/lib/fontawesome/css/font-awesome.css",
+                "web/static/src/libs/fontawesome/css/font-awesome.css",
                 "base_fontawesome/static/src/css/fontawesome.css",
             ),
             "base_fontawesome/static/lib/fontawesome-5.15.4/css/all.css",
@@ -22,10 +22,17 @@
             "base_fontawesome/static/src/js/form_renderer.js",
             "base_fontawesome/static/src/js/list_renderer.js",
         ],
+        "web.assets_frontend": [
+            (
+                "replace",
+                "web/static/src/libs/fontawesome/css/font-awesome.css",
+                "base_fontawesome/static/src/css/fontawesome.css",
+            ),
+        ],
         "web.report_assets_common": [
             (
                 "replace",
-                "web/static/lib/fontawesome/css/font-awesome.css",
+                "web/static/src/libs/fontawesome/css/font-awesome.css",
                 "base_fontawesome/static/src/css/fontawesome.css",
             ),
             "base_fontawesome/static/lib/fontawesome-5.15.4/css/all.css",
diff --git a/base_fontawesome/templates/assets.xml b/base_fontawesome/templates/assets.xml
deleted file mode 100644
index afc2a7a2b..000000000
--- a/base_fontawesome/templates/assets.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!--
-Copyright 2017 Simone Orsi
-License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
--->
-<odoo>
-    <template id="assets_common" inherit_id="web.assets_common">
-        <xpath
-            expr="link[@href='/web/static/lib/fontawesome/css/font-awesome.css']"
-            position="replace"
-        >
-            <link
-                rel="stylesheet"
-                type="text/css"
-                href="/base_fontawesome/static/src/css/fontawesome.css"
-            />
-            <link
-                rel="stylesheet"
-                type="text/css"
-                href="/base_fontawesome/static/lib/fontawesome-5.13.0/css/all.css"
-            />
-            <link
-                rel="stylesheet"
-                type="text/css"
-                href="/base_fontawesome/static/lib/fontawesome-5.13.0/css/v4-shims.css"
-            />
-        </xpath>
-        <xpath expr="." position="inside">
-            <script
-                type="text/javascript"
-                src="/base_fontawesome/static/src/js/form_renderer.js"
-            />
-            <script
-                type="text/javascript"
-                src="/base_fontawesome/static/src/js/list_renderer.js"
-            />
-        </xpath>
-    </template>
-    <template id="report_assets_common" inherit_id="web.report_assets_common">
-        <xpath
-            expr="link[@href='/web/static/lib/fontawesome/css/font-awesome.css']"
-            position="replace"
-        >
-            <link
-                rel="stylesheet"
-                type="text/css"
-                href="/base_fontawesome/static/lib/fontawesome-5.13.0/css/all.css"
-            />
-            <link
-                rel="stylesheet"
-                type="text/css"
-                href="/base_fontawesome/static/lib/fontawesome-5.13.0/css/v4-shims.css"
-            />
-        </xpath>
-    </template>
-</odoo>