diff --git a/drivers/chrome/manifest.json b/drivers/chrome/manifest.json
index 1bcf8a69b..a0e8e522c 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=extension&utm_campaign=extensions",
 	"description": "Identifies software on the web",
-	"version": "2.16",
+	"version": "2.17",
 	"default_locale": "en",
 	"manifest_version": 2,
 	"icons": {
diff --git a/drivers/firefox/content/js/driver.js b/drivers/firefox/content/js/driver.js
index 23fe2e638..b729490f3 100644
--- a/drivers/firefox/content/js/driver.js
+++ b/drivers/firefox/content/js/driver.js
@@ -139,7 +139,7 @@
 				i, j, elements, menuItem, menuSeparator, image,
 				remove    = [],
 				container = d.getElementById('wappalyzer-container'),
-				menu      = d.getElementById('wappalyzer-menu'),
+				menu      = d.getElementById('wappalyzer-applications'),
 				url       = gBrowser.currentURI.spec.split('#')[0]
 				;
 
@@ -315,10 +315,10 @@
 		if ( prefs.getBoolPref('addonBar') ) {
 			d.getElementById('wappalyzer-addonbar').appendChild(d.getElementById('wappalyzer-container'));
 		} else {
-			d.getElementById('urlbar-icons').appendChild(d.getElementById('wappalyzer-container'));
+			d.getElementById('urlbar-icons').insertBefore(d.getElementById('wappalyzer-container'), d.getElementById('urlbar-icons').childNodes[0]);
 		}
 
-		d.getElementById('wappalyzer-addonbar').setAttribute('collapsed', prefs.getBoolPref('addonBar') ? 'true' : 'false');
+		d.getElementById('wappalyzer-addonbar').setAttribute('collapsed', prefs.getBoolPref('addonBar') ? 'false' : 'true');
 	}
 
 	/**
diff --git a/drivers/firefox/content/xul/wappalyzer.xul b/drivers/firefox/content/xul/wappalyzer.xul
index 9b7236414..b7dd67381 100755
--- a/drivers/firefox/content/xul/wappalyzer.xul
+++ b/drivers/firefox/content/xul/wappalyzer.xul
@@ -31,7 +31,7 @@
 					</menupopup>
 				</menu>
 
-				<menuseparator/>
+				<vbox id="wappalyzer-applications"/>
 			</menupopup>
 		</hbox>
 	</hbox>