diff --git a/drivers/firefox/install.rdf b/drivers/firefox/install.rdf
index 1cadc6ded..1cbba8a37 100644
--- a/drivers/firefox/install.rdf
+++ b/drivers/firefox/install.rdf
@@ -18,11 +18,11 @@
 
 		<em:optionsURL>chrome://wappalyzer/content/xul/preferences.xul</em:optionsURL>
 		<em:optionsType>3</em:optionsType>
-		<em:iconURL>chrome://wappalyzer/skin/images/icon128x128.png</em:iconURL>
 
 		<em:name>Wappalyzer</em:name>
 		<em:description>Identifies software on the web.</em:description>
-		<em:iconURL>chrome://wappalyzer/icon.png</em:iconURL>
+		<em:iconURL>chrome://wappalyzer/skin/images/icon128x128.png</em:iconURL>
+		<em:icon64URL>chrome://wappalyzer/skin/images/icon64x64.png</em:icon64URL>
 		<em:creator>Elbert Alias</em:creator>
 		<em:homepageURL>http://wappalyzer.com</em:homepageURL>
 	</Description>
diff --git a/drivers/firefox/locale/en-US/wappalyzer.dtd b/drivers/firefox/locale/en-US/wappalyzer.dtd
index 3ab8b0f99..daf00b3b4 100755
--- a/drivers/firefox/locale/en-US/wappalyzer.dtd
+++ b/drivers/firefox/locale/en-US/wappalyzer.dtd
@@ -1,53 +1,52 @@
-<!ENTITY wappalyzer.name              "Wappalyzer">
-<!ENTITY wappalyzer.help              "Wappalyzer - Click for more detail and settings">
-
-<!ENTITY wappalyzer.showIcons         "Show application icons">
-<!ENTITY wappalyzer.preferences       "Options">
-<!ENTITY wappalyzer.addonBar          "Place in addon-bar">
-<!ENTITY wappalyzer.categories        "Categories">
-<!ENTITY wappalyzer.performance       "Performance">
-<!ENTITY wappalyzer.interface         "Interface">
-<!ENTITY wappalyzer.general           "General">
-<!ENTITY wappalyzer.tracking          "Tracking">
-<!ENTITY wappalyzer.research          "Anonymously send reports on detected applications to wappalyzer.com for research">
-<!ENTITY wappalyzer.analyzeHeaders    "Analyze response headers">
-<!ENTITY wappalyzer.analyzeJavaScript "Analyze JavaScript">
-<!ENTITY wappalyzer.analyzeOnload     "Analyze onLoad events">
-
-<!ENTITY wappalyzer.feedback          "Feedback">
-<!ENTITY wappalyzer.github            "Github">
-<!ENTITY wappalyzer.twitter           "Twitter">
-<!ENTITY wappalyzer.website           "Go to wappalyzer.com">
-
-<!ENTITY wappalyzer.cat1              "CMS">
-<!ENTITY wappalyzer.cat2              "Message boards">
-<!ENTITY wappalyzer.cat3              "Database managers">
-<!ENTITY wappalyzer.cat4              "Documentation tools">
-<!ENTITY wappalyzer.cat5              "Widgets">
-<!ENTITY wappalyzer.cat6              "Web shops">
-<!ENTITY wappalyzer.cat7              "Photo galleries">
-<!ENTITY wappalyzer.cat8              "Wikis">
-<!ENTITY wappalyzer.cat9              "Hosting panels">
-<!ENTITY wappalyzer.cat10             "Analytics">
-<!ENTITY wappalyzer.cat11             "Blogs">
-<!ENTITY wappalyzer.cat12             "JavaScript frameworks">
-<!ENTITY wappalyzer.cat13             "Issue trackers">
-<!ENTITY wappalyzer.cat14             "Video players">
-<!ENTITY wappalyzer.cat15             "Comment systems">
-<!ENTITY wappalyzer.cat16             "CAPTCHAs">
-<!ENTITY wappalyzer.cat17             "Font scripts">
-<!ENTITY wappalyzer.cat18             "Web frameworks">
-<!ENTITY wappalyzer.cat19             "Miscellaneous">
-<!ENTITY wappalyzer.cat20             "Editors">
-<!ENTITY wappalyzer.cat21             "LMS">
-<!ENTITY wappalyzer.cat22             "Web servers">
-<!ENTITY wappalyzer.cat23             "Cache tools">
-<!ENTITY wappalyzer.cat24             "Rich text editors">
-<!ENTITY wappalyzer.cat25             "Javascript Graphics">
-<!ENTITY wappalyzer.cat26             "Mobile Frameworks">
-<!ENTITY wappalyzer.cat27             "Programming Languages">
-<!ENTITY wappalyzer.cat28             "Operating Systems">
-<!ENTITY wappalyzer.cat29             "Search Engines">
-<!ENTITY wappalyzer.cat30             "Web Mail">
-<!ENTITY wappalyzer.cat31             "CDN">
-<!ENTITY wappalyzer.cat32             "Marketing Automation">
+<!ENTITY wappalyzer.name              "Wappalyzer">
+<!ENTITY wappalyzer.help              "Wappalyzer - Click for more detail and settings">
+
+<!ENTITY wappalyzer.showIcons         "Show application icons">
+<!ENTITY wappalyzer.preferences       "Options">
+<!ENTITY wappalyzer.addonBar          "Place in addon-bar">
+<!ENTITY wappalyzer.categories        "Categories">
+<!ENTITY wappalyzer.performance       "Performance">
+<!ENTITY wappalyzer.interface         "Interface">
+<!ENTITY wappalyzer.tracking          "Tracking">
+<!ENTITY wappalyzer.research          "Anonymously send reports on detected applications to wappalyzer.com for research">
+<!ENTITY wappalyzer.analyzeHeaders    "Analyze response headers">
+<!ENTITY wappalyzer.analyzeJavaScript "Analyze JavaScript">
+<!ENTITY wappalyzer.analyzeOnload     "Analyze onLoad events">
+
+<!ENTITY wappalyzer.feedback          "Feedback">
+<!ENTITY wappalyzer.github            "Github">
+<!ENTITY wappalyzer.twitter           "Twitter">
+<!ENTITY wappalyzer.website           "Go to wappalyzer.com">
+
+<!ENTITY wappalyzer.cat1              "CMS">
+<!ENTITY wappalyzer.cat2              "Message boards">
+<!ENTITY wappalyzer.cat3              "Database managers">
+<!ENTITY wappalyzer.cat4              "Documentation tools">
+<!ENTITY wappalyzer.cat5              "Widgets">
+<!ENTITY wappalyzer.cat6              "Web shops">
+<!ENTITY wappalyzer.cat7              "Photo galleries">
+<!ENTITY wappalyzer.cat8              "Wikis">
+<!ENTITY wappalyzer.cat9              "Hosting panels">
+<!ENTITY wappalyzer.cat10             "Analytics">
+<!ENTITY wappalyzer.cat11             "Blogs">
+<!ENTITY wappalyzer.cat12             "JavaScript frameworks">
+<!ENTITY wappalyzer.cat13             "Issue trackers">
+<!ENTITY wappalyzer.cat14             "Video players">
+<!ENTITY wappalyzer.cat15             "Comment systems">
+<!ENTITY wappalyzer.cat16             "CAPTCHAs">
+<!ENTITY wappalyzer.cat17             "Font scripts">
+<!ENTITY wappalyzer.cat18             "Web frameworks">
+<!ENTITY wappalyzer.cat19             "Miscellaneous">
+<!ENTITY wappalyzer.cat20             "Editors">
+<!ENTITY wappalyzer.cat21             "LMS">
+<!ENTITY wappalyzer.cat22             "Web servers">
+<!ENTITY wappalyzer.cat23             "Cache tools">
+<!ENTITY wappalyzer.cat24             "Rich text editors">
+<!ENTITY wappalyzer.cat25             "Javascript Graphics">
+<!ENTITY wappalyzer.cat26             "Mobile Frameworks">
+<!ENTITY wappalyzer.cat27             "Programming Languages">
+<!ENTITY wappalyzer.cat28             "Operating Systems">
+<!ENTITY wappalyzer.cat29             "Search Engines">
+<!ENTITY wappalyzer.cat30             "Web Mail">
+<!ENTITY wappalyzer.cat31             "CDN">
+<!ENTITY wappalyzer.cat32             "Marketing Automation">