diff --git a/background.js b/background.js
index c20f6d6..7f0d30f 100644
--- a/background.js
+++ b/background.js
@@ -65,10 +65,11 @@ chrome.extension.onConnect.addListener(function(port) {
 );
 
 chrome.runtime.onMessage.addListener(function(message, sender, sendResponse) {
-    console.log(sender.tab);
     if (message.action === "test") {
         if (message.usesPiwik) {
-            chrome.browserAction.setBadgeText({text: "Piwik!", tabId: sender.tab.id});
+            chrome.pageAction.show(sender.tab.id);
+        } else {
+            chrome.pageAction.hide(sender.tab.id);
         }
     }
 });
diff --git a/images/applogo_732.png b/images/applogo_732.png
new file mode 100644
index 0000000..3f40298
Binary files /dev/null and b/images/applogo_732.png differ
diff --git a/images/icon128.png b/images/icon128.png
new file mode 100644
index 0000000..f6b2364
Binary files /dev/null and b/images/icon128.png differ
diff --git a/images/icon16.png b/images/icon16.png
new file mode 100644
index 0000000..17ef89e
Binary files /dev/null and b/images/icon16.png differ
diff --git a/images/icon24.png b/images/icon24.png
new file mode 100644
index 0000000..514d319
Binary files /dev/null and b/images/icon24.png differ
diff --git a/images/icon32.png b/images/icon32.png
new file mode 100644
index 0000000..136b36a
Binary files /dev/null and b/images/icon32.png differ
diff --git a/images/icon48.png b/images/icon48.png
new file mode 100644
index 0000000..709ada0
Binary files /dev/null and b/images/icon48.png differ
diff --git a/manifest.json b/manifest.json
index b7ae3ff..9619e0a 100644
--- a/manifest.json
+++ b/manifest.json
@@ -16,11 +16,19 @@
       "background.js"
     ]
   },
-  "browser_action": {
-    "default_title": "Google Mail",
-    // optional; shown in tooltip
+  "icons": {
+    "16": "images/icon16.png",
+    "48": "images/icon48.png",
+    "128": "images/icon128.png"
+  },
+  "page_action": {
+    "default_icon": {
+      "16": "images/icon16.png",
+      "24": "images/icon24.png",
+      "32": "images/icon32.png"
+    },
+    "default_title": "Piwik Checker",
     "default_popup": "popup.html"
-    // optional
   },
   "content_scripts": [
     {