diff --git a/web_environment_ribbon/README.rst b/web_environment_ribbon/README.rst
index 83f210884..4694702b1 100644
--- a/web_environment_ribbon/README.rst
+++ b/web_environment_ribbon/README.rst
@@ -23,7 +23,7 @@ Web Environment Ribbon
     :target: https://runbot.odoo-community.org/runbot/162/14.0
     :alt: Try me on Runbot
 
-|badge1| |badge2| |badge3| |badge4| |badge5| 
+|badge1| |badge2| |badge3| |badge4| |badge5|
 
 Mark a Test Environment with a red ribbon on the top left corner in every page
 
@@ -79,6 +79,7 @@ Contributors
 * Xavier Jiménez <xavier.jimenez@qubiq.es>
 * Dennis Sluijk <d.sluijk@onestein.nl>
 * Eric Lembregts <eric@lembregts.eu>
+* Andreas Perhab <a.perhab@wtioit.at>
 
 Maintainers
 ~~~~~~~~~~~
diff --git a/web_environment_ribbon/__manifest__.py b/web_environment_ribbon/__manifest__.py
index 876fb6ba8..f2e08da6a 100644
--- a/web_environment_ribbon/__manifest__.py
+++ b/web_environment_ribbon/__manifest__.py
@@ -6,7 +6,7 @@
 
 {
     "name": "Web Environment Ribbon",
-    "version": "14.0.1.0.0",
+    "version": "15.0.1.0.0",
     "category": "Web",
     "author": "Francesco OpenCode Apruzzese, "
     "Tecnativa, "
@@ -14,7 +14,14 @@
     "website": "https://github.com/OCA/web",
     "license": "AGPL-3",
     "depends": ["web"],
-    "data": ["data/ribbon_data.xml", "view/base_view.xml"],
+    "data": [
+        "data/ribbon_data.xml",
+    ],
     "auto_install": False,
     "installable": True,
+    "assets": {
+        "web.assets_common": [
+            "web_environment_ribbon/static/**/*",
+        ],
+    },
 }
diff --git a/web_environment_ribbon/tests/test_environment_ribbon_data.py b/web_environment_ribbon/tests/test_environment_ribbon_data.py
index f2a4378fd..577dbed00 100644
--- a/web_environment_ribbon/tests/test_environment_ribbon_data.py
+++ b/web_environment_ribbon/tests/test_environment_ribbon_data.py
@@ -4,7 +4,7 @@
 from odoo.tests import common
 
 
-class TestEnvironmentRibbonData(common.SavepointCase):
+class TestEnvironmentRibbonData(common.TransactionCase):
     @classmethod
     def setUpClass(cls):
         super(TestEnvironmentRibbonData, cls).setUpClass()
diff --git a/web_environment_ribbon/view/base_view.xml b/web_environment_ribbon/view/base_view.xml
deleted file mode 100644
index 28bcbf9f6..000000000
--- a/web_environment_ribbon/view/base_view.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2015 Francesco OpenCode Apruzzese <cescoap@gmail.com>
-     Copyright 2016 Antonio Espinosa <antonio.espinosa@tecnativa.com>
-     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
-<odoo>
-    <!-- Load css for ribbons -->
-    <template
-        id="assets_backend"
-        name="ribbon_test assets"
-        inherit_id="web.assets_backend"
-    >
-        <xpath expr="." position="inside">
-            <link
-                rel="stylesheet"
-                href="/web_environment_ribbon/static/src/css/ribbon.css"
-            />
-            <script
-                type="text/javascript"
-                src="/web_environment_ribbon/static/src/js/ribbon.js"
-            />
-        </xpath>
-    </template>
-</odoo>