diff --git a/.gitignore b/.gitignore
index 62a9ea2..3fe9fe0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 .idea/
 libs/
 node_modules/
+web-ext-artifacts/
diff --git a/.travis.yml b/.travis.yml
index d1809a6..8e0471f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,4 +7,4 @@ before_script:
   - npm install -g web-ext
 script:
   - jshint js/
-  - web-ext lint --ignore-files --warnings-as-errors "libs/*" "*.sh"
\ No newline at end of file
+  - web-ext lint --warnings-as-errors --ignore-files "libs/*" "**/*.sh"
\ No newline at end of file
diff --git a/img/generate.sh b/img/generate.sh
new file mode 100755
index 0000000..1861718
--- /dev/null
+++ b/img/generate.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+for size in 128 256 512
+do
+    inkscape -f icon.svg -w $size -h $size -e "logo-${size}x${size}.png"
+done
diff --git a/img/logo-128x128.png b/img/logo-128x128.png
new file mode 100644
index 0000000..0bd0273
Binary files /dev/null and b/img/logo-128x128.png differ
diff --git a/img/logo-256x256.png b/img/logo-256x256.png
new file mode 100644
index 0000000..55707c0
Binary files /dev/null and b/img/logo-256x256.png differ
diff --git a/img/logo-512x512.png b/img/logo-512x512.png
new file mode 100644
index 0000000..adeb817
Binary files /dev/null and b/img/logo-512x512.png differ
diff --git a/manifest.json b/manifest.json
index 20df9c3..f64c6ac 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,11 +2,12 @@
   "manifest_version": 2,
   "name": "__MSG_extention_name__",
   "short_name": "piwik-injector",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "author": "Lukas Winkler, xcv58, hromadadan",
   "description": "__MSG_extention_description__",
   "icons": {
-    "128": "img/icon256.png"
+    "128": "img/logo-128x128.png",
+    "256": "img/logo-256x256.png"
   },
   "content_scripts": [
     {
@@ -20,7 +21,10 @@
     }
   ],
   "browser_action": {
-    "default_icon": "img/icon256.png",
+    "default_icon": {
+      "128": "img/logo-128x128.png",
+      "256": "img/logo-256x256.png"
+    },
     "default_popup": "popup.html"
   },
   "permissions": [
diff --git a/package.json b/package.json
index e7011c0..8eceeef 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,8 @@
   },
   "devDependencies": {},
   "scripts": {
-    "copy": "bash copy.sh"
+    "copy": "bash copy.sh",
+    "build": "web-ext build --ignore-files '**/*.sh'"
   },
   "repository": {
     "type": "git",