diff --git a/gulpfile.js b/gulpfile.js
index 91e0ca4..6ddb11f 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -3,7 +3,7 @@
 var gulp = require('gulp');
 var zip = require('gulp-zip');
 
-var files = ['manifest.json', 'background.js'];
+var files = ['manifest.json', 'background.js', '*.png'];
 var xpiName = 'catgifs.xpi';
 
 gulp.task('default', function () {
@@ -11,4 +11,3 @@ gulp.task('default', function () {
     .pipe(zip(xpiName))
     .pipe(gulp.dest('.'));
 });
-
diff --git a/manifest.json b/manifest.json
index 8eeae4d..32d50b1 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,5 +1,9 @@
 {
   "manifest_version": 2,
+  "icons": {
+    "48": "icon.png",
+    "128": "icon128.png"
+  },
   "name": "Cat Gifs!",
   "version": "1.0",
   "applications": {
@@ -18,6 +22,10 @@
   ],
 
   "browser_action": {
+    "default_icon": {
+      "19": "button.png",
+      "38": "button38.png"
+    },
     "default_title": "Cat Gifs!"
   }
 }