diff --git a/chrome_addon/background.js b/chrome_addon/background.js
index aff02cb..571dffe 100644
--- a/chrome_addon/background.js
+++ b/chrome_addon/background.js
@@ -7,7 +7,7 @@ chrome.runtime.onMessage.addListener(
 		type: "basic",
 		title : "gPass",
 		message : request.options.message,
-		iconUrl:chrome.extension.getURL("gpass_icon.png")
+		iconUrl:chrome.extension.getURL("gpass_icon_64.png")
 	    };
 
 	    chrome.notifications.create("gPass", options, function(){});
diff --git a/chrome_addon/gpass_icon.png b/chrome_addon/gpass_icon.png
deleted file mode 100644
index d78a7b3..0000000
Binary files a/chrome_addon/gpass_icon.png and /dev/null differ
diff --git a/chrome_addon/manifest.json b/chrome_addon/manifest.json
index 62e78de..033b728 100644
--- a/chrome_addon/manifest.json
+++ b/chrome_addon/manifest.json
@@ -4,7 +4,10 @@
     "name": "gpass",
     "version": "0.6",
     "description": "gPass : global password manager",
-
+    "icons" : {"16":"gpass_icon_16.png", "32":"gpass_icon_32.png", "64":"gpass_icon_64.png", "128":"gpass_icon_128.png"},
+    "author" : "Grégory Soutadé",
+    "homepage_url" : "http://indefero.soutade.fr/p/gpass",
+    
     "content_scripts": [
 	{
 	    "matches": ["https://*/*", "http://*/*"],
diff --git a/firefox_addon/lib/main.js b/firefox_addon/lib/main.js
index c7a77f3..c757a97 100644
--- a/firefox_addon/lib/main.js
+++ b/firefox_addon/lib/main.js
@@ -19,11 +19,12 @@
 
 var {Cc, Ci} = require("chrome");
 var notifications = require("sdk/notifications");
+var self = require("sdk/self");
+var prefSet = require("sdk/simple-prefs");
 
 var pkdbf2 = require("pkdbf2").pkdbf2;
 var aes = require("jsaes").aes;
 var parseURI = require("parseuri").parseURI;
-var prefSet = require("sdk/simple-prefs");
 var DEBUG = false;
 var pkdbf2_level = getPref("pkdbf2_level");
 var protocol_version = 3;
@@ -56,10 +57,12 @@ function debug(s)
 
 function notify(text, data)
 {
+    var icon = self.data.url("gpass_icon_64.png");
     notifications.notify({
 	title: "gPass",
 	text: text,
 	data: data,
+	iconUrl: icon,
     });
 }
 
diff --git a/firefox_addon/package.json b/firefox_addon/package.json
index f225eb8..c6d57b8 100644
--- a/firefox_addon/package.json
+++ b/firefox_addon/package.json
@@ -5,7 +5,9 @@
   "description": "gPass : global password manager",
   "author": "Grégory Soutadé",
   "license": "GNU GPL v3",
-  "version": "0.6",
+    "homepage" : "http://indefero.soutade.fr/p/gpass",
+    "icon" : "data/gpass_icon_64.png",
+    "version": "0.6",
     "preferences": [
     {
         "name": "account_url",