diff --git a/src/static/manifest.json b/src/static/manifest.json
index ef260648b..b7be2491b 100644
--- a/src/static/manifest.json
+++ b/src/static/manifest.json
@@ -1,22 +1,21 @@
 {
-  "manifest_version": 2,
+  "manifest_version": 3,
   "name": "__MSG_manifest_name__",
   "short_name": "__MSG_manifest_short_name__",
   "description": "__MSG_manifest_description__",
   "version": "2023.3.14",
   "default_locale": "en",
-  "browser_action": {
+  "action": {
     "default_icon": {
       "16": "icon/light/16.png",
-      "32" : "icon/light/32.png",
+      "32": "icon/light/32.png",
       "48": "icon/light/48.png",
       "128": "icon/light/128.png"
     },
     "default_popup": "popup.html"
   },
   "background": {
-    "scripts": ["js/backgroundScript.js"],
-    "persistent": true
+    "service_worker": "js/backgroundScript.js"
   },
   "content_scripts": [{
     "matches": ["*://*/*"],
@@ -33,8 +32,13 @@
     "clipboardWrite",
     "storage"
   ],
-  "content_security_policy": "script-src 'self' 'wasm-eval'; object-src 'self';",
+  "content_security_policy": {
+    "extension_pages": "script-src 'self' 'wasm-unsafe-eval'"
+  },
   "web_accessible_resources": [
-    "js/injectedScript.js"
+    {
+      "resources": ["js/injectedScript.js"],
+      "matches": ["*://*/*"]
+    }
   ]
 }
diff --git a/src/utilities/base64/base64.ts b/src/utilities/base64/base64.ts
index 54b88e909..4ae7396e6 100644
--- a/src/utilities/base64/base64.ts
+++ b/src/utilities/base64/base64.ts
@@ -5,11 +5,11 @@ import { TextEncoder } from '@polkadot/x-textencoder';
 export function stringToBase64(input: string): string {
   const bytes = new TextEncoder().encode(input);
   const asciiString = String.fromCodePoint(...bytes);
-  return window.btoa(asciiString);
+  return btoa(asciiString);
 }
 
 export function base64ToString(base64: string): string {
-  const asciiString = window.atob(base64);
+  const asciiString = atob(base64);
   const bytes = Uint8Array.from(asciiString, (c) => c.charCodeAt(0));
   return new TextDecoder().decode(bytes);
 }
diff --git a/src/utilities/storageEncryption/storageEncryption.ts b/src/utilities/storageEncryption/storageEncryption.ts
index 8082a39e0..221517304 100644
--- a/src/utilities/storageEncryption/storageEncryption.ts
+++ b/src/utilities/storageEncryption/storageEncryption.ts
@@ -87,11 +87,11 @@ export async function decrypt(
 function arrayBufferToBase64(arrayBuffer: ArrayBuffer): string {
   const bytes = new Uint8Array(arrayBuffer);
   const asciiString = String.fromCodePoint(...bytes);
-  return window.btoa(asciiString);
+  return btoa(asciiString);
 }
 
 function base64ToArrayBuffer(base64: string): ArrayBuffer {
-  const asciiString = window.atob(base64);
+  const asciiString = atob(base64);
   return Uint8Array.from(asciiString, (c) => c.charCodeAt(0)).buffer;
 }