diff --git a/Makefile b/Makefile
index 0666dfe2c..62565670a 100644
--- a/Makefile
+++ b/Makefile
@@ -226,6 +226,7 @@ FIREFOX_CONTENT_DIR := $(EXTENSION_SRC)/firefox/$(CONTENT_DIR)/
 FIREFOX_EXTENSION_FILES_TO_COPY = \
 	*.js \
 	*.rdf \
+	*.png \
 	install.rdf.in \
 	README.mozilla \
 	components \
@@ -234,12 +235,16 @@ FIREFOX_EXTENSION_FILES_TO_COPY = \
 FIREFOX_EXTENSION_FILES = \
 	bootstrap.js \
 	install.rdf \
+	icon.png \
+	icon64.png \
 	components \
 	content \
 	LICENSE \
 	$(NULL)
 FIREFOX_MC_EXTENSION_FILES = \
 	bootstrap.js \
+	icon.png \
+	icon64.png \
 	components \
 	content \
 	LICENSE \
diff --git a/extensions/firefox/icon.png b/extensions/firefox/icon.png
new file mode 100644
index 000000000..64763756e
Binary files /dev/null and b/extensions/firefox/icon.png differ
diff --git a/extensions/firefox/icon64.png b/extensions/firefox/icon64.png
new file mode 100644
index 000000000..0131bbb5c
Binary files /dev/null and b/extensions/firefox/icon64.png differ
diff --git a/make.js b/make.js
index f2e499f8a..33771aeb7 100755
--- a/make.js
+++ b/make.js
@@ -220,6 +220,7 @@ target.firefox = function() {
       FIREFOX_EXTENSION_FILES_TO_COPY =
         ['*.js',
          '*.rdf',
+         '*.png',
          'install.rdf.in',
          'README.mozilla',
          'components',
@@ -227,11 +228,15 @@ target.firefox = function() {
       FIREFOX_EXTENSION_FILES =
         ['bootstrap.js',
          'install.rdf',
+         'icon.png',
+         'icon64.png',
          'components',
          'content',
          'LICENSE'];
       FIREFOX_MC_EXTENSION_FILES =
         ['bootstrap.js',
+         'icon.png',
+         'icon64.png',
          'components',
          'content',
          'LICENSE'];