diff --git a/bin/wappalyzer-build b/bin/wappalyzer-build
index 6a18d6bb6..44cb73a39 100755
--- a/bin/wappalyzer-build
+++ b/bin/wappalyzer-build
@@ -67,11 +67,21 @@ pushd $WAPPALYZER_ROOT/src/drivers/chrome > /dev/null
 zip -qr $WAPPALYZER_ROOT/build/wappalyzer_chrome.zip .
 
 # Google Chrome
-echo "Building WebExtension driver..."
+echo "Building WebExtension drivers..."
 
 pushd $WAPPALYZER_ROOT/src/drivers/webextension > /dev/null
 
-zip -qr $WAPPALYZER_ROOT/build/wappalyzer_webextension.zip .
+zip -qr $WAPPALYZER_ROOT/build/wappalyzer_webextension.firefox.zip . -x manifest.chrome-opera.json manifest.edge.json
+
+printf "@ manifest.firefox.json\n@=manifest.json\n" | zipnote -w $WAPPALYZER_ROOT/build/wappalyzer_webextension.firefox.zip
+
+zip -qr $WAPPALYZER_ROOT/build/wappalyzer_webextension.chrome-opera.zip . -x manifest.firefox.json manifest.edge.json
+
+printf "@ manifest.chrome-opera.json\n@=manifest.json\n" | zipnote -w $WAPPALYZER_ROOT/build/wappalyzer_webextension.chrome-opera.zip
+
+zip -qr $WAPPALYZER_ROOT/build/wappalyzer_webextension.edge.zip . -x manifest.chrome-opera.json manifest.firefox.json
+
+printf "@ manifest.edge.json\n@=manifest.json\n" | zipnote -w $WAPPALYZER_ROOT/build/wappalyzer_webextension.edge.zip
 
 popd > /dev/null
 
diff --git a/src/drivers/webextension/images/logo.svg b/src/drivers/webextension/images/logo.svg
new file mode 100644
index 000000000..dfcc9511e
--- /dev/null
+++ b/src/drivers/webextension/images/logo.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="114px" height="97px" viewBox="0 0 114 97" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 41 (35326) - http://www.bohemiancoding.com/sketch -->
+    <title>Logo</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="wappalyzer_rebrand" transform="translate(-317.000000, -669.000000)">
+            <g id="Logo" transform="translate(317.000000, 669.000000)">
+                <g id="Logo-Mark-Purple">
+                    <polygon id="Fill-1" fill="#1C0172" points="57.0285 74.6616 6.5385 48.4526 0.0015 53.1396 -0.0005 56.0066 57.0285 96.9046 114.0545 56.0086 114.0585 53.1426 107.5185 48.4526"></polygon>
+                    <path d="M57.0285,0.0003 L0.0025,40.8963 L-0.0005,43.7633 L57.0285,84.6623 L114.0545,43.7653 L114.0575,40.8983 L57.0285,0.0003 Z M64.4895,40.3623 L57.5365,30.7743 L63.4645,26.4363 L75.8235,44.7273 L70.8465,48.3703 L57.5555,42.8723 L57.4985,42.9133 L65.0675,52.5983 L60.0905,56.2403 L35.0915,47.1963 L41.0385,42.8443 L54.1065,47.9333 L54.1805,47.8783 L46.9285,38.5343 L51.6075,35.1113 L64.4145,40.4173 L64.4895,40.3623 Z" id="Fill-2" fill="#4608AD"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/drivers/webextension/manifest.chrome-opera.json b/src/drivers/webextension/manifest.chrome-opera.json
new file mode 100644
index 000000000..39bcb08b2
--- /dev/null
+++ b/src/drivers/webextension/manifest.chrome-opera.json
@@ -0,0 +1,62 @@
+{ "name": "Wappalyzer",
+  "short_name": "Wappalyzer",
+  "author": "AliasIO",
+	"homepage_url": "https://wappalyzer.com/",
+	"description": "Identify web technologies",
+	"version": "3",
+	"default_locale": "en",
+	"manifest_version": 2,
+	"icons": {
+		"16":  "images/icon_16.png",
+		"19":  "images/icon_19.png",
+		"32":  "images/icon_32.png",
+		"38":  "images/icon_38.png",
+		"128": "images/icon_128.png"
+	},
+	"page_action": {
+		"default_icon": {
+      "16":  "images/icon_16.png",
+      "19":  "images/icon_19.png",
+      "32":  "images/icon_32.png",
+      "38":  "images/icon_38.png",
+      "128": "images/icon_128.png"
+    },
+		"default_title": "Wappalyzer",
+		"default_popup": "popup.html"
+	},
+	"background": {
+		"page": "background.html",
+    "persistent": true
+	},
+	"content_scripts": [ {
+			"matches": [ "http://*/*", "https://*/*" ],
+			"js": [
+				"js/browser-polyfill.js",
+				"js/content.js"
+			],
+			"run_at": "document_idle"
+		}, {
+			"matches": [ "http://*/*", "https://*/*" ],
+			"js": [
+				"js/browser-polyfill.js",
+				"js/iframe.js"
+			],
+			"run_at": "document_start",
+			"all_frames": true
+		} ],
+	"web_accessible_resources": [
+		"js/inject.js"
+	],
+	"options_ui": {
+    "page": "options.html",
+    "open_in_tab": false
+  },
+	"permissions": [
+		"tabs",
+		"webRequest",
+		"webNavigation",
+		"http://*/*",
+		"https://*/*"
+	],
+	"content_security_policy": "script-src 'self'; object-src 'self'"
+}
diff --git a/src/drivers/webextension/manifest.edge.json b/src/drivers/webextension/manifest.edge.json
new file mode 100644
index 000000000..1ee3c20ab
--- /dev/null
+++ b/src/drivers/webextension/manifest.edge.json
@@ -0,0 +1,59 @@
+{ "name": "Wappalyzer",
+  "short_name": "Wappalyzer",
+  "author": "AliasIO",
+	"homepage_url": "https://wappalyzer.com/",
+	"description": "Identify web technologies",
+	"version": "3",
+	"default_locale": "en",
+	"manifest_version": 2,
+	"icons": {
+		"16":  "images/icon_16.png",
+		"19":  "images/icon_19.png",
+		"32":  "images/icon_32.png",
+		"38":  "images/icon_38.png",
+		"128": "images/icon_128.png"
+	},
+	"page_action": {
+		"default_icon": {
+      "16":  "images/icon_16.png",
+      "19":  "images/icon_19.png",
+      "32":  "images/icon_32.png",
+      "38":  "images/icon_38.png",
+      "128": "images/icon_128.png"
+    },
+		"default_title": "Wappalyzer",
+		"default_popup": "popup.html"
+	},
+	"background": {
+		"page": "background.html",
+    "persistent": true
+	},
+	"content_scripts": [ {
+			"matches": [ "http://*/*", "https://*/*" ],
+			"js": [
+				"js/browser-polyfill.js",
+				"js/content.js"
+			],
+			"run_at": "document_idle"
+		}, {
+			"matches": [ "http://*/*", "https://*/*" ],
+			"js": [
+				"js/browser-polyfill.js",
+				"js/iframe.js"
+			],
+			"run_at": "document_start",
+			"all_frames": true
+		} ],
+	"web_accessible_resources": [
+		"js/inject.js"
+	],
+  "options_page": "options.html",
+	"permissions": [
+		"tabs",
+		"webRequest",
+		"webNavigation",
+		"http://*/*",
+		"https://*/*"
+	],
+	"content_security_policy": "script-src 'self'; object-src 'self'"
+}
diff --git a/src/drivers/webextension/manifest.json b/src/drivers/webextension/manifest.firefox.json
similarity index 83%
rename from src/drivers/webextension/manifest.json
rename to src/drivers/webextension/manifest.firefox.json
index c447013ee..5a1d501a3 100644
--- a/src/drivers/webextension/manifest.json
+++ b/src/drivers/webextension/manifest.firefox.json
@@ -6,15 +6,15 @@
 	"version": "3",
 	"default_locale": "en",
 	"manifest_version": 2,
-	"icons": {
-		"16":  "images/icon_16.png",
-		"32":  "images/icon_32.png",
-		"128": "images/icon_128.png"
-	},
+  "applications": {
+    "gecko": {
+      "id": "wappalyzer@crunchlabz.com",
+      "strict_min_version": "52.0"
+    }
+  },
+	"icon": "images/logo.svg",
 	"page_action": {
-		"default_icon": {
-      "32": "images/icon_32.png"
-    },
+		"default_icon": "images/logo.svg",
 		"default_title": "Wappalyzer",
 		"default_popup": "popup.html"
 	},
@@ -41,7 +41,6 @@
 	"web_accessible_resources": [
 		"js/inject.js"
 	],
-  "options_page": "options.html",
 	"options_ui": {
     "page": "options.html",
     "open_in_tab": false
diff --git a/src/drivers/webextension/options.html b/src/drivers/webextension/options.html
index bd7f606d0..4b6817ce7 100644
--- a/src/drivers/webextension/options.html
+++ b/src/drivers/webextension/options.html
@@ -6,7 +6,7 @@
 
 		<title data-i18n="options">Wappalyzer options</title>
 
-		<link rel="icon" href="images/icon_16.png">
+		<link rel="icon" href="images/icon_32.png">
 
 		<link rel="stylesheet" href="css/options.css">