diff --git a/drivers/bookmarklet/images/icons/Chartbeat.png b/drivers/bookmarklet/images/icons/Chartbeat.png
new file mode 100644
index 000000000..2cb597cc7
Binary files /dev/null and b/drivers/bookmarklet/images/icons/Chartbeat.png differ
diff --git a/drivers/bookmarklet/images/icons/Cufon.png b/drivers/bookmarklet/images/icons/Cufon.png
new file mode 100644
index 000000000..cd2e3f029
Binary files /dev/null and b/drivers/bookmarklet/images/icons/Cufon.png differ
diff --git a/drivers/bookmarklet/images/icons/Mono.png b/drivers/bookmarklet/images/icons/Mono.png
new file mode 100644
index 000000000..912809eb2
Binary files /dev/null and b/drivers/bookmarklet/images/icons/Mono.png differ
diff --git a/drivers/bookmarklet/images/icons/Posterous.png b/drivers/bookmarklet/images/icons/Posterous.png
new file mode 100644
index 000000000..3150f4f93
Binary files /dev/null and b/drivers/bookmarklet/images/icons/Posterous.png differ
diff --git a/drivers/bookmarklet/images/icons/SAP.png b/drivers/bookmarklet/images/icons/SAP.png
new file mode 100644
index 000000000..9217c8f87
Binary files /dev/null and b/drivers/bookmarklet/images/icons/SAP.png differ
diff --git a/drivers/bookmarklet/images/icons/Wink.png b/drivers/bookmarklet/images/icons/Wink.png
new file mode 100644
index 000000000..3e7204032
Binary files /dev/null and b/drivers/bookmarklet/images/icons/Wink.png differ
diff --git a/drivers/bookmarklet/images/icons/Xajax.png b/drivers/bookmarklet/images/icons/Xajax.png
new file mode 100644
index 000000000..bba0d40ab
Binary files /dev/null and b/drivers/bookmarklet/images/icons/Xajax.png differ
diff --git a/drivers/chrome/images/icons/Chartbeat.png b/drivers/chrome/images/icons/Chartbeat.png
new file mode 100644
index 000000000..2cb597cc7
Binary files /dev/null and b/drivers/chrome/images/icons/Chartbeat.png differ
diff --git a/drivers/chrome/images/icons/Cufon.png b/drivers/chrome/images/icons/Cufon.png
new file mode 100644
index 000000000..cd2e3f029
Binary files /dev/null and b/drivers/chrome/images/icons/Cufon.png differ
diff --git a/drivers/chrome/images/icons/Mono.png b/drivers/chrome/images/icons/Mono.png
new file mode 100644
index 000000000..912809eb2
Binary files /dev/null and b/drivers/chrome/images/icons/Mono.png differ
diff --git a/drivers/chrome/images/icons/Posterous.png b/drivers/chrome/images/icons/Posterous.png
new file mode 100644
index 000000000..3150f4f93
Binary files /dev/null and b/drivers/chrome/images/icons/Posterous.png differ
diff --git a/drivers/chrome/images/icons/SAP.png b/drivers/chrome/images/icons/SAP.png
new file mode 100644
index 000000000..9217c8f87
Binary files /dev/null and b/drivers/chrome/images/icons/SAP.png differ
diff --git a/drivers/chrome/images/icons/Wink.png b/drivers/chrome/images/icons/Wink.png
new file mode 100644
index 000000000..3e7204032
Binary files /dev/null and b/drivers/chrome/images/icons/Wink.png differ
diff --git a/drivers/chrome/images/icons/Xajax.png b/drivers/chrome/images/icons/Xajax.png
new file mode 100644
index 000000000..bba0d40ab
Binary files /dev/null and b/drivers/chrome/images/icons/Xajax.png differ
diff --git a/drivers/chrome/js/content.js b/drivers/chrome/js/content.js
index 1d9d3fb0e..992396362 100644
--- a/drivers/chrome/js/content.js
+++ b/drivers/chrome/js/content.js
@@ -28,18 +28,7 @@
 				var script = document.createElement('script');
 
 				script.setAttribute('id', 'wappalyzerEnvDetection');
-
-				script.innerHTML =
-					'(function() {' +
-						'try {' +
-							'var i, environmentVars, event = document.createEvent("Events");' +
-							'event.initEvent("wappalyzerEvent", true, false);' +
-							'for ( i in window ) { environmentVars += i + " "; }' +
-							'document.getElementById("wappalyzerData").appendChild(document.createComment(environmentVars));' +
-							'document.getElementById("wappalyzerData").dispatchEvent(event);' +
-						'}' +
-						'catch(e) { }' +
-					'})();';
+				script.setAttribute('src', chrome.extension.getURL('js/inject.js'));
 
 				container.addEventListener('wappalyzerEvent', (function(event) {
 					var environmentVars = event.target.childNodes[0].nodeValue;
diff --git a/drivers/chrome/js/inject.js b/drivers/chrome/js/inject.js
new file mode 100644
index 000000000..fd734182e
--- /dev/null
+++ b/drivers/chrome/js/inject.js
@@ -0,0 +1,14 @@
+(function() {
+	try {
+		var i, environmentVars, e = document.createEvent('Events');
+
+		e.initEvent('wappalyzerEvent', true, false);
+
+		for ( i in window ) {
+			environmentVars += i + ' ';
+		}
+
+		document.getElementById('wappalyzerData').appendChild(document.createComment(environmentVars));
+		document.getElementById('wappalyzerData').dispatchEvent(e);
+	} catch(e) { }
+}());
diff --git a/drivers/chrome/manifest.json b/drivers/chrome/manifest.json
index 10e878c6e..3b246332e 100644
--- a/drivers/chrome/manifest.json
+++ b/drivers/chrome/manifest.json
@@ -1,7 +1,7 @@
 { "name": "Wappalyzer",
 	"homepage_url": "http://wappalyzer.com?utm_source=chrome&utm_medium=context&utm_campaign=extensions",
 	"description": "Identifies software on the web",
-	"version": "2.21",
+	"version": "2.22",
 	"default_locale": "en",
 	"manifest_version": 2,
 	"icons": {
@@ -19,6 +19,9 @@
 		"js": [ "js/content.js" ],
 		"run_at": "document_idle"
 	}],
+	"web_accessible_resources": [
+		"js/inject.js"
+	],
 	"options_page": "options.html",
 	"permissions": [ "tabs", "http://*/*", "https://*/*" ],
 	"content_security_policy": "script-src 'self' https://ssl.google-analytics.com; object-src 'self'"
diff --git a/drivers/firefox-jetpack/images/icons/Chartbeat.png b/drivers/firefox-jetpack/images/icons/Chartbeat.png
new file mode 100644
index 000000000..2cb597cc7
Binary files /dev/null and b/drivers/firefox-jetpack/images/icons/Chartbeat.png differ
diff --git a/drivers/firefox-jetpack/images/icons/Cufon.png b/drivers/firefox-jetpack/images/icons/Cufon.png
new file mode 100644
index 000000000..cd2e3f029
Binary files /dev/null and b/drivers/firefox-jetpack/images/icons/Cufon.png differ
diff --git a/drivers/firefox-jetpack/images/icons/Mono.png b/drivers/firefox-jetpack/images/icons/Mono.png
new file mode 100644
index 000000000..912809eb2
Binary files /dev/null and b/drivers/firefox-jetpack/images/icons/Mono.png differ
diff --git a/drivers/firefox-jetpack/images/icons/Posterous.png b/drivers/firefox-jetpack/images/icons/Posterous.png
new file mode 100644
index 000000000..3150f4f93
Binary files /dev/null and b/drivers/firefox-jetpack/images/icons/Posterous.png differ
diff --git a/drivers/firefox-jetpack/images/icons/SAP.png b/drivers/firefox-jetpack/images/icons/SAP.png
new file mode 100644
index 000000000..9217c8f87
Binary files /dev/null and b/drivers/firefox-jetpack/images/icons/SAP.png differ
diff --git a/drivers/firefox-jetpack/images/icons/Wink.png b/drivers/firefox-jetpack/images/icons/Wink.png
new file mode 100644
index 000000000..3e7204032
Binary files /dev/null and b/drivers/firefox-jetpack/images/icons/Wink.png differ
diff --git a/drivers/firefox-jetpack/images/icons/Xajax.png b/drivers/firefox-jetpack/images/icons/Xajax.png
new file mode 100644
index 000000000..bba0d40ab
Binary files /dev/null and b/drivers/firefox-jetpack/images/icons/Xajax.png differ
diff --git a/drivers/firefox/skin/images/icons/Cufon.png b/drivers/firefox/skin/images/icons/Cufon.png
new file mode 100644
index 000000000..cd2e3f029
Binary files /dev/null and b/drivers/firefox/skin/images/icons/Cufon.png differ
diff --git a/drivers/firefox/skin/images/icons/Mono.png b/drivers/firefox/skin/images/icons/Mono.png
new file mode 100644
index 000000000..912809eb2
Binary files /dev/null and b/drivers/firefox/skin/images/icons/Mono.png differ
diff --git a/drivers/firefox/skin/images/icons/Posterous.png b/drivers/firefox/skin/images/icons/Posterous.png
new file mode 100644
index 000000000..3150f4f93
Binary files /dev/null and b/drivers/firefox/skin/images/icons/Posterous.png differ
diff --git a/drivers/firefox/skin/images/icons/SAP.png b/drivers/firefox/skin/images/icons/SAP.png
new file mode 100644
index 000000000..9217c8f87
Binary files /dev/null and b/drivers/firefox/skin/images/icons/SAP.png differ
diff --git a/drivers/firefox/skin/images/icons/Wink.png b/drivers/firefox/skin/images/icons/Wink.png
new file mode 100644
index 000000000..3e7204032
Binary files /dev/null and b/drivers/firefox/skin/images/icons/Wink.png differ
diff --git a/drivers/firefox/skin/images/icons/Xajax.png b/drivers/firefox/skin/images/icons/Xajax.png
new file mode 100644
index 000000000..bba0d40ab
Binary files /dev/null and b/drivers/firefox/skin/images/icons/Xajax.png differ
diff --git a/drivers/html/images/icons/Chartbeat.png b/drivers/html/images/icons/Chartbeat.png
new file mode 100644
index 000000000..2cb597cc7
Binary files /dev/null and b/drivers/html/images/icons/Chartbeat.png differ
diff --git a/drivers/html/images/icons/Cufon.png b/drivers/html/images/icons/Cufon.png
new file mode 100644
index 000000000..cd2e3f029
Binary files /dev/null and b/drivers/html/images/icons/Cufon.png differ
diff --git a/drivers/html/images/icons/Mono.png b/drivers/html/images/icons/Mono.png
new file mode 100644
index 000000000..912809eb2
Binary files /dev/null and b/drivers/html/images/icons/Mono.png differ
diff --git a/drivers/html/images/icons/Posterous.png b/drivers/html/images/icons/Posterous.png
new file mode 100644
index 000000000..3150f4f93
Binary files /dev/null and b/drivers/html/images/icons/Posterous.png differ
diff --git a/drivers/html/images/icons/SAP.png b/drivers/html/images/icons/SAP.png
new file mode 100644
index 000000000..9217c8f87
Binary files /dev/null and b/drivers/html/images/icons/SAP.png differ
diff --git a/drivers/html/images/icons/Wink.png b/drivers/html/images/icons/Wink.png
new file mode 100644
index 000000000..3e7204032
Binary files /dev/null and b/drivers/html/images/icons/Wink.png differ
diff --git a/drivers/html/images/icons/Xajax.png b/drivers/html/images/icons/Xajax.png
new file mode 100644
index 000000000..bba0d40ab
Binary files /dev/null and b/drivers/html/images/icons/Xajax.png differ
diff --git a/share/images/icons/Mono.png b/share/images/icons/Mono.png
new file mode 100644
index 000000000..912809eb2
Binary files /dev/null and b/share/images/icons/Mono.png differ