diff --git a/source/Background/index.ts b/source/Background/index.ts
index 6c9e647..cb0ff5c 100644
--- a/source/Background/index.ts
+++ b/source/Background/index.ts
@@ -1,6 +1 @@
-import { browser } from "webextension-polyfill-ts";
-import TraderRepository from "../ContentScript/trader-repository";
-
-browser.runtime.onInstalled.addListener((): void => {
-    TraderRepository.refreshGlobalTradersStorage();
-});
+export {};
diff --git a/source/ContentScript/element-factories/owns-badge.ts b/source/ContentScript/element-factories/owns-badge.ts
index 747f260..3f0fe8e 100644
--- a/source/ContentScript/element-factories/owns-badge.ts
+++ b/source/ContentScript/element-factories/owns-badge.ts
@@ -11,7 +11,20 @@ export default class OwnsBadge {
 
         let recordings = trader.wantsCount === 1 ? "recording" : "recordings";
 
-        badge.innerHTML = `Owns <strong style="font-weight: semibold; color: #0f172a;">${trader.ownsCount} ${recordings}</strong> that I want`;
+        let span1 = document.createElement("span");
+        span1.innerText = "Owns ";
+
+        let strong = document.createElement("strong");
+        strong.style.fontWeight = "semibold";
+        strong.style.color = "#0f172a";
+        strong.innerText = `${trader.ownsCount} ${recordings}`;
+
+        let span2 = document.createElement("span");
+        span2.innerText = " that I want";
+
+        badge.appendChild(span1);
+        badge.appendChild(strong);
+        badge.appendChild(span2);
 
         return badge;
     }
diff --git a/source/ContentScript/element-factories/owns-column.ts b/source/ContentScript/element-factories/owns-column.ts
index 5b215fb..28eacde 100644
--- a/source/ContentScript/element-factories/owns-column.ts
+++ b/source/ContentScript/element-factories/owns-column.ts
@@ -17,7 +17,15 @@ export default class OwnsColumn {
         let a = document.createElement("a");
         a.target = "_blank";
         a.href = trader.ownsList ?? "#";
-        a.innerHTML = `${count} <i class="fad fa-arrow-up-right-from-square"></i>`;
+
+        let span = document.createElement("span");
+        span.innerText = count.toString() + " ";
+
+        let i = document.createElement("i");
+        i.classList.add("fad", "fa-arrow-down-left-from-square");
+
+        a.appendChild(span);
+        a.appendChild(i);
 
         td.appendChild(a);
 
diff --git a/source/ContentScript/element-factories/wants-badge.ts b/source/ContentScript/element-factories/wants-badge.ts
index 338ed89..b303cfc 100644
--- a/source/ContentScript/element-factories/wants-badge.ts
+++ b/source/ContentScript/element-factories/wants-badge.ts
@@ -11,7 +11,20 @@ export default class WantsBadge {
 
         let recordings = trader.wantsCount === 1 ? "recording" : "recordings";
 
-        badge.innerHTML = `Wants <strong style="font-weight: semibold; color: #0f172a;">${trader.wantsCount} ${recordings}</strong> that I own`;
+        let span1 = document.createElement("span");
+        span1.innerText = "Wants ";
+
+        let strong = document.createElement("strong");
+        strong.style.fontWeight = "semibold";
+        strong.style.color = "#0f172a";
+        strong.innerText = `${trader.wantsCount} ${recordings}`;
+
+        let span2 = document.createElement("span");
+        span2.innerText = " that I own";
+
+        badge.appendChild(span1);
+        badge.appendChild(strong);
+        badge.appendChild(span2);
 
         return badge;
     }
diff --git a/source/ContentScript/element-factories/wants-column.ts b/source/ContentScript/element-factories/wants-column.ts
index f499fae..779bc89 100644
--- a/source/ContentScript/element-factories/wants-column.ts
+++ b/source/ContentScript/element-factories/wants-column.ts
@@ -17,7 +17,15 @@ export default class WantsColumn {
         let a = document.createElement("a");
         a.target = "_blank";
         a.href = trader.wantsList ?? "#";
-        a.innerHTML = `${count} <i class="fad fa-arrow-up-right-from-square"></i>`;
+
+        let span = document.createElement("span");
+        span.innerText = count.toString() + " ";
+
+        let i = document.createElement("i");
+        i.classList.add("fad", "fa-arrow-down-left-from-square");
+
+        a.appendChild(span);
+        a.appendChild(i);
 
         td.appendChild(a);