diff --git a/mobile/android/base/Makefile.in b/mobile/android/base/Makefile.in
index d53a46042c8..add7aac9588 100644
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -573,6 +573,8 @@ RES_DRAWABLE_BASE = \
   res/drawable/validation_arrow.png \
   res/drawable/validation_arrow_inverted.png \
   res/drawable/validation_bg.9.png \
+  res/drawable/bookmarkdefaults_favicon_support.png \
+  res/drawable/bookmarkdefaults_favicon_addons.png \
   res/drawable/handle_end.png \
   res/drawable/handle_middle.png \
   res/drawable/handle_start.png \
diff --git a/mobile/android/base/db/BrowserProvider.java.in b/mobile/android/base/db/BrowserProvider.java.in
index dc506ead9fd..b2df70a2eec 100644
--- a/mobile/android/base/db/BrowserProvider.java.in
+++ b/mobile/android/base/db/BrowserProvider.java.in
@@ -41,7 +41,6 @@ import org.mozilla.gecko.db.DBUtils;
 import org.mozilla.gecko.ProfileMigrator;
 import org.mozilla.gecko.sync.Utils;
 import org.mozilla.gecko.util.GeckoBackgroundThread;
-import org.mozilla.gecko.util.GeckoJarReader;
 
 import android.app.SearchManager;
 import android.content.ContentProvider;
@@ -61,7 +60,6 @@ import android.database.sqlite.SQLiteOpenHelper;
 import android.database.sqlite.SQLiteQueryBuilder;
 import android.graphics.BitmapFactory;
 import android.graphics.Bitmap;
-import android.graphics.drawable.BitmapDrawable;
 import android.net.Uri;
 import android.os.Build;
 import android.text.TextUtils;
@@ -1020,72 +1018,31 @@ public class BrowserProvider extends ContentProvider {
         }
 
         private void setDefaultFavicon(SQLiteDatabase db, String name, String url) {
-            ByteArrayOutputStream stream = getDefaultFaviconFromPath(db, name, url);
-            if (stream == null) {
-              stream = getDefaultFaviconFromDrawable(db, name, url);
-            }
-            if (stream != null) {
-                ContentValues values = new ContentValues();
-                values.put(Favicons.DATA, stream.toByteArray());
-                values.put(Favicons.PAGE_URL, url);
-                insertFavicon(db, values);
-            }
-        }
-
-        private ByteArrayOutputStream getDefaultFaviconFromPath(SQLiteDatabase db, String name, String url) {
-            ByteArrayOutputStream stream = null;
-            Class stringClass = R.string.class;
-            try {
-                // Look for a drawable with the id R.drawable.bookmarkdefaults_favicon_*
-                Field faviconField = stringClass.getField(name.replace("_title_", "_favicon_"));
-                if (faviconField == null)
-                  return null;
-                int faviconId = faviconField.getInt(null);
-                String path = mContext.getString(faviconId);
-
-                String apkPath = mContext.getPackageResourcePath();
-                File apkFile = new File(apkPath);
-                BitmapDrawable bitmapDrawable = GeckoJarReader.getBitmapDrawable(mContext.getResources(),
-                                                                                 "jar:jar:" + apkFile.toURI() + "!/omni.ja!/" + path);
-                if (bitmapDrawable == null) {
-                  return null;
-                }
-                Bitmap bitmap = bitmapDrawable.getBitmap();
-                if (bitmap == null) {
-                  return null;
-                }
-                stream = new ByteArrayOutputStream();
-                bitmap.compress(Bitmap.CompressFormat.PNG, 100, stream);
-            } catch (java.lang.IllegalAccessException ex) {
-                Log.e(LOGTAG, "[Path] Can't create favicon " + name, ex);
-            } catch (java.lang.NoSuchFieldException ex) {
-                // if there is no such field, create the bookmark without a favicon
-                Log.d(LOGTAG, "[Path] Can't create favicon " + name);
-            }
-            return stream;
-        }
-
-        private ByteArrayOutputStream getDefaultFaviconFromDrawable(SQLiteDatabase db, String name, String url) {
             Class<?> drawablesClass = R.drawable.class;
             ByteArrayOutputStream stream = null;
             try {
                 // Look for a drawable with the id R.drawable.bookmarkdefaults_favicon_*
                 Field faviconField = drawablesClass.getField(name.replace("_title_", "_favicon_"));
                 if (faviconField == null)
-                  return null;
+                  return;
 
                 int faviconId = faviconField.getInt(null);
                 Bitmap bitmap = BitmapFactory.decodeResource(mContext.getResources(), faviconId);
                 stream = new ByteArrayOutputStream();
                 bitmap.compress(Bitmap.CompressFormat.PNG, 100, stream);
             } catch (java.lang.IllegalAccessException ex) {
-                Log.e(LOGTAG, "[Drawable] Can't create favicon " + name, ex);
+                Log.e(LOGTAG, "Can't create favicon " + name, ex);
             } catch (java.lang.NoSuchFieldException ex) {
                 // if there is no such field, create the bookmark without a favicon
-                Log.d(LOGTAG, "[Drawable] Can't create favicon " + name);
+                Log.d(LOGTAG, "Can't create favicon " + name);
             }
 
-            return stream;
+            if (stream != null) {
+                ContentValues values = new ContentValues();
+                values.put(Favicons.DATA, stream.toByteArray());
+                values.put(Favicons.PAGE_URL, url);
+                insertFavicon(db, values);
+            }
         }
 
         private void createOrUpdateAllSpecialFolders(SQLiteDatabase db) {
diff --git a/mobile/android/base/strings.xml.in b/mobile/android/base/strings.xml.in
index 920e94badf3..8a83491a96b 100644
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -209,14 +209,12 @@
        profile/bookmarks.inc. Don't expose the URLs to L10N. -->
   <string name="bookmarkdefaults_title_aboutfirefox">@bookmarks_aboutBrowser@</string>
   <string name="bookmarkdefaults_url_aboutfirefox">about:firefox</string>
-  <string name="bookmarkdefaults_favicon_aboutfirefox">chrome/chrome/content/branding/favicon64.png</string>
 
   <string name="bookmarkdefaults_title_addons">@bookmarks_addons@</string>
   <string name="bookmarkdefaults_url_addons">https://addons.mozilla.org/@AB_CD@/android/</string>
 
   <string name="bookmarkdefaults_title_support">@bookmarks_support@</string>
   <string name="bookmarkdefaults_url_support">http://support.mozilla.org/@AB_CD@/mobile</string>
-  <string name="bookmarkdefaults_favicon_abouthome">chrome/chrome/content/branding/favicon64.png</string>
 
   <string name="bookmarkdefaults_title_abouthome">@bookmarks_aboutHome@</string>
   <string name="bookmarkdefaults_url_abouthome">about:home</string>
diff --git a/mobile/android/branding/aurora/android-resources.mn b/mobile/android/branding/aurora/android-resources.mn
index b85e33467d9..b75b8717111 100644
--- a/mobile/android/branding/aurora/android-resources.mn
+++ b/mobile/android/branding/aurora/android-resources.mn
@@ -1,3 +1,4 @@
 mobile/android/branding/aurora/content/logo.png
 mobile/android/branding/aurora/content/favicon32.png
+mobile/android/branding/aurora/content/bookmarkdefaults_favicon_aboutfirefox.png
 mobile/android/branding/aurora/content/mdpi/widget_icon.png
diff --git a/mobile/android/branding/aurora/content/bookmarkdefaults_favicon_aboutfirefox.png b/mobile/android/branding/aurora/content/bookmarkdefaults_favicon_aboutfirefox.png
new file mode 100644
index 00000000000..f515b5d337e
Binary files /dev/null and b/mobile/android/branding/aurora/content/bookmarkdefaults_favicon_aboutfirefox.png differ
diff --git a/mobile/android/branding/aurora/content/favicon32.png b/mobile/android/branding/aurora/content/favicon32.png
index 40421cc7948..f515b5d337e 100644
Binary files a/mobile/android/branding/aurora/content/favicon32.png and b/mobile/android/branding/aurora/content/favicon32.png differ
diff --git a/mobile/android/branding/aurora/content/favicon64.png b/mobile/android/branding/aurora/content/favicon64.png
deleted file mode 100644
index bb949ccbade..00000000000
Binary files a/mobile/android/branding/aurora/content/favicon64.png and /dev/null differ
diff --git a/mobile/android/branding/aurora/content/jar.mn b/mobile/android/branding/aurora/content/jar.mn
index 32eae6af95b..0052ad0243d 100644
--- a/mobile/android/branding/aurora/content/jar.mn
+++ b/mobile/android/branding/aurora/content/jar.mn
@@ -8,4 +8,3 @@ chrome.jar:
   content/branding/logoWordmark.png              (logoWordmark.png)
   content/branding/logo.png                      (logo.png)
   content/branding/favicon32.png                 (favicon32.png)
-  content/branding/favicon64.png                 (favicon64.png)
diff --git a/mobile/android/branding/beta/android-resources.mn b/mobile/android/branding/beta/android-resources.mn
index 22ad106ed4a..7c6e5de0423 100644
--- a/mobile/android/branding/beta/android-resources.mn
+++ b/mobile/android/branding/beta/android-resources.mn
@@ -1,3 +1,4 @@
 mobile/android/branding/beta/content/logo.png
 mobile/android/branding/beta/content/favicon32.png
+mobile/android/branding/beta/content/bookmarkdefaults_favicon_aboutfirefox.png
 mobile/android/branding/beta/content/mdpi/widget_icon.png
diff --git a/mobile/android/branding/beta/content/bookmarkdefaults_favicon_aboutfirefox.png b/mobile/android/branding/beta/content/bookmarkdefaults_favicon_aboutfirefox.png
new file mode 100644
index 00000000000..ac4a6968bf2
Binary files /dev/null and b/mobile/android/branding/beta/content/bookmarkdefaults_favicon_aboutfirefox.png differ
diff --git a/mobile/android/branding/beta/content/favicon64.png b/mobile/android/branding/beta/content/favicon64.png
deleted file mode 100644
index 20bae0717c7..00000000000
Binary files a/mobile/android/branding/beta/content/favicon64.png and /dev/null differ
diff --git a/mobile/android/branding/beta/content/jar.mn b/mobile/android/branding/beta/content/jar.mn
index 32eae6af95b..0052ad0243d 100644
--- a/mobile/android/branding/beta/content/jar.mn
+++ b/mobile/android/branding/beta/content/jar.mn
@@ -8,4 +8,3 @@ chrome.jar:
   content/branding/logoWordmark.png              (logoWordmark.png)
   content/branding/logo.png                      (logo.png)
   content/branding/favicon32.png                 (favicon32.png)
-  content/branding/favicon64.png                 (favicon64.png)
diff --git a/mobile/android/branding/nightly/android-resources.mn b/mobile/android/branding/nightly/android-resources.mn
index 53b5afd7715..62e901eeef1 100644
--- a/mobile/android/branding/nightly/android-resources.mn
+++ b/mobile/android/branding/nightly/android-resources.mn
@@ -1,3 +1,4 @@
 mobile/android/branding/nightly/content/logo.png
 mobile/android/branding/nightly/content/favicon32.png
+mobile/android/branding/nightly/content/bookmarkdefaults_favicon_aboutfirefox.png
 mobile/android/branding/nightly/content/mdpi/widget_icon.png
diff --git a/mobile/android/branding/nightly/content/bookmarkdefaults_favicon_aboutfirefox.png b/mobile/android/branding/nightly/content/bookmarkdefaults_favicon_aboutfirefox.png
new file mode 100644
index 00000000000..43ad466c615
Binary files /dev/null and b/mobile/android/branding/nightly/content/bookmarkdefaults_favicon_aboutfirefox.png differ
diff --git a/mobile/android/branding/nightly/content/favicon64.png b/mobile/android/branding/nightly/content/favicon64.png
deleted file mode 100644
index 1ac6eaf5197..00000000000
Binary files a/mobile/android/branding/nightly/content/favicon64.png and /dev/null differ
diff --git a/mobile/android/branding/nightly/content/jar.mn b/mobile/android/branding/nightly/content/jar.mn
index 32eae6af95b..0052ad0243d 100644
--- a/mobile/android/branding/nightly/content/jar.mn
+++ b/mobile/android/branding/nightly/content/jar.mn
@@ -8,4 +8,3 @@ chrome.jar:
   content/branding/logoWordmark.png              (logoWordmark.png)
   content/branding/logo.png                      (logo.png)
   content/branding/favicon32.png                 (favicon32.png)
-  content/branding/favicon64.png                 (favicon64.png)
diff --git a/mobile/android/branding/official/android-resources.mn b/mobile/android/branding/official/android-resources.mn
index 9e3ca743cce..c380a12da36 100644
--- a/mobile/android/branding/official/android-resources.mn
+++ b/mobile/android/branding/official/android-resources.mn
@@ -1,3 +1,4 @@
 mobile/android/branding/official/content/logo.png
 mobile/android/branding/official/content/favicon32.png
+mobile/android/branding/official/content/bookmarkdefaults_favicon_aboutfirefox.png
 mobile/android/branding/official/content/mdpi/widget_icon.png
diff --git a/mobile/android/branding/official/content/bookmarkdefaults_favicon_aboutfirefox.png b/mobile/android/branding/official/content/bookmarkdefaults_favicon_aboutfirefox.png
new file mode 100644
index 00000000000..ac4a6968bf2
Binary files /dev/null and b/mobile/android/branding/official/content/bookmarkdefaults_favicon_aboutfirefox.png differ
diff --git a/mobile/android/branding/official/content/favicon64.png b/mobile/android/branding/official/content/favicon64.png
deleted file mode 100644
index 20bae0717c7..00000000000
Binary files a/mobile/android/branding/official/content/favicon64.png and /dev/null differ
diff --git a/mobile/android/branding/official/content/jar.mn b/mobile/android/branding/official/content/jar.mn
index 32eae6af95b..0052ad0243d 100644
--- a/mobile/android/branding/official/content/jar.mn
+++ b/mobile/android/branding/official/content/jar.mn
@@ -8,4 +8,3 @@ chrome.jar:
   content/branding/logoWordmark.png              (logoWordmark.png)
   content/branding/logo.png                      (logo.png)
   content/branding/favicon32.png                 (favicon32.png)
-  content/branding/favicon64.png                 (favicon64.png)
diff --git a/mobile/android/branding/unofficial/android-resources.mn b/mobile/android/branding/unofficial/android-resources.mn
index 03c8177bd90..a5eab084ae8 100644
--- a/mobile/android/branding/unofficial/android-resources.mn
+++ b/mobile/android/branding/unofficial/android-resources.mn
@@ -1,3 +1,4 @@
 mobile/android/branding/unofficial/content/favicon32.png
 mobile/android/branding/unofficial/content/logo.png
+mobile/android/branding/unofficial/content/bookmarkdefaults_favicon_aboutfirefox.png
 mobile/android/branding/unofficial/content/mdpi/widget_icon.png
diff --git a/mobile/android/branding/unofficial/content/bookmarkdefaults_favicon_aboutfirefox.png b/mobile/android/branding/unofficial/content/bookmarkdefaults_favicon_aboutfirefox.png
new file mode 100644
index 00000000000..3f04acd50d3
Binary files /dev/null and b/mobile/android/branding/unofficial/content/bookmarkdefaults_favicon_aboutfirefox.png differ
diff --git a/mobile/android/branding/unofficial/content/favicon64.png b/mobile/android/branding/unofficial/content/favicon64.png
deleted file mode 100644
index d6263c9d240..00000000000
Binary files a/mobile/android/branding/unofficial/content/favicon64.png and /dev/null differ
diff --git a/mobile/android/branding/unofficial/content/fennec_72x72.png b/mobile/android/branding/unofficial/content/fennec_72x72.png
index 1cdb4df2fcb..c7874013f6a 100644
Binary files a/mobile/android/branding/unofficial/content/fennec_72x72.png and b/mobile/android/branding/unofficial/content/fennec_72x72.png differ
diff --git a/mobile/android/branding/unofficial/content/jar.mn b/mobile/android/branding/unofficial/content/jar.mn
index 32eae6af95b..0052ad0243d 100644
--- a/mobile/android/branding/unofficial/content/jar.mn
+++ b/mobile/android/branding/unofficial/content/jar.mn
@@ -8,4 +8,3 @@ chrome.jar:
   content/branding/logoWordmark.png              (logoWordmark.png)
   content/branding/logo.png                      (logo.png)
   content/branding/favicon32.png                 (favicon32.png)
-  content/branding/favicon64.png                 (favicon64.png)
diff --git a/mobile/android/chrome/content/about.xhtml b/mobile/android/chrome/content/about.xhtml
index 3122ccf07f9..b6fcd233627 100644
--- a/mobile/android/chrome/content/about.xhtml
+++ b/mobile/android/chrome/content/about.xhtml
@@ -18,7 +18,7 @@
   <meta name="viewport" content="width=480; initial-scale=.6667; user-scalable=no"/>
   <title>&aboutPage.title;</title>
   <link rel="stylesheet" href="chrome://browser/skin/aboutPage.css" type="text/css"/>
-  <link rel="icon" type="image/png" sizes="64x64" href="chrome://branding/content/favicon64.png" />
+  <link rel="icon" type="image/png" href="chrome://branding/content/favicon32.png" />
 </head>
 
 <body dir="&locale.dir;">
diff --git a/mobile/android/chrome/content/aboutAddons.xhtml b/mobile/android/chrome/content/aboutAddons.xhtml
index 5a3877fe703..518d65b3ef2 100644
--- a/mobile/android/chrome/content/aboutAddons.xhtml
+++ b/mobile/android/chrome/content/aboutAddons.xhtml
@@ -18,7 +18,7 @@
 <head>
   <title>&aboutAddons.title2;</title>
   <meta name="viewport" content="width=480; initial-scale=.6667; user-scalable=0" />
-  <link rel="icon" type="image/png" sizes="64x64" href="chrome://branding/content/favicon64.png" />
+  <link rel="icon" type="image/png" href="chrome://branding/content/favicon32.png" />
   <link rel="stylesheet" href="chrome://browser/skin/aboutAddons.css" type="text/css"/>
   <style>
     .hide-on-enable,
diff --git a/mobile/android/chrome/content/aboutApps.xhtml b/mobile/android/chrome/content/aboutApps.xhtml
index 7ac8f54a05d..c12296620ce 100644
--- a/mobile/android/chrome/content/aboutApps.xhtml
+++ b/mobile/android/chrome/content/aboutApps.xhtml
@@ -21,7 +21,7 @@
   <head>
     <title>&aboutApps.title2;</title>
     <meta name="viewport" content="width=480; initial-scale=.6667; user-scalable=0" />
-    <link rel="icon" type="image/png" sizes="64x64" href="chrome://branding/content/favicon64.png" />
+    <link rel="icon" type="image/png" href="chrome://branding/content/favicon32.png" />
     <link rel="stylesheet" type="text/css" href="chrome://browser/skin/aboutApps.css" media="all" />
     <script type="text/javascript;version=1.8" src="chrome://browser/content/aboutApps.js"></script>
   </head>
diff --git a/mobile/android/chrome/content/aboutCertError.xhtml b/mobile/android/chrome/content/aboutCertError.xhtml
index a908ccb2297..077d290ef20 100644
--- a/mobile/android/chrome/content/aboutCertError.xhtml
+++ b/mobile/android/chrome/content/aboutCertError.xhtml
@@ -27,7 +27,7 @@
          should be updated. If this page starts using a different favicon
          than neterrorm nsFaviconService->SetAndLoadFaviconForPage
          should be updated to ignore this one as well. -->
-    <link rel="icon" type="image/png" id="favicon" sizes="64x64" href="chrome://global/skin/icons/warning-64.png"/>
+    <link rel="icon" type="image/png" id="favicon" href="chrome://global/skin/icons/warning-16.png"/>
 
     <script type="application/javascript"><![CDATA[
       // Error url MUST be formatted like this:
diff --git a/mobile/android/chrome/content/aboutDownloads.xhtml b/mobile/android/chrome/content/aboutDownloads.xhtml
index 9419e1f91e1..106bb89bee1 100644
--- a/mobile/android/chrome/content/aboutDownloads.xhtml
+++ b/mobile/android/chrome/content/aboutDownloads.xhtml
@@ -19,7 +19,7 @@
 <head>
   <title>&aboutDownloads.title;</title>
   <meta name="viewport" content="width=480; initial-scale=.6667; user-scalable=0" />
-  <link rel="icon" type="image/png" sizes="64x64" href="chrome://branding/content/favicon64.png" />
+  <link rel="icon" type="image/png" href="chrome://branding/content/favicon32.png" />
   <link rel="stylesheet" href="chrome://browser/skin/aboutDownloads.css" type="text/css"/>
 </head>
 
diff --git a/mobile/android/chrome/content/aboutFeedback.xhtml b/mobile/android/chrome/content/aboutFeedback.xhtml
index 6e896e3ed20..9a91839c395 100644
--- a/mobile/android/chrome/content/aboutFeedback.xhtml
+++ b/mobile/android/chrome/content/aboutFeedback.xhtml
@@ -19,7 +19,7 @@
   <title>&pageTitle;</title>
   <meta name="viewport" content="width=device-width; user-scalable=0" />
   <link rel="stylesheet" href="chrome://browser/skin/aboutFeedback.css" type="text/css"/>
-  <link rel="icon" type="image/png" sizes="64x64" href="chrome://branding/content/favicon64.png" />
+  <link rel="icon" type="image/png" href="chrome://branding/content/favicon32.png" />
 </head>
 
 <body dir="&locale.dir;" onload="init();" onunload="uninit();">
diff --git a/mobile/android/chrome/content/aboutHome.xhtml b/mobile/android/chrome/content/aboutHome.xhtml
index 3d9c76ef832..c58d8bc388f 100644
--- a/mobile/android/chrome/content/aboutHome.xhtml
+++ b/mobile/android/chrome/content/aboutHome.xhtml
@@ -9,7 +9,7 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-  <link rel="icon" type="image/png" sizes="64x64" href="chrome://branding/content/favicon64.png" />
+  <link rel="icon" type="image/png" href="chrome://branding/content/favicon32.png" />
 </head>
 <body>
 </body>
diff --git a/mobile/android/chrome/content/blockedSite.xhtml b/mobile/android/chrome/content/blockedSite.xhtml
index b663b502d1f..558a45a706f 100644
--- a/mobile/android/chrome/content/blockedSite.xhtml
+++ b/mobile/android/chrome/content/blockedSite.xhtml
@@ -19,7 +19,7 @@
   <head>
     <meta name="viewport" content="width=device-width; user-scalable=false" />
     <link rel="stylesheet" href="chrome://global/skin/netError.css" type="text/css" media="all" />
-    <link rel="icon" type="image/png" id="favicon" sizes="64x64" href="chrome://global/skin/icons/blacklist_large.png"/>
+    <link rel="icon" type="image/png" id="favicon" href="chrome://global/skin/icons/blacklist_favicon.png"/>
 
     <script type="application/javascript"><![CDATA[
       // Error url MUST be formatted like this:
diff --git a/mobile/android/chrome/content/netError.xhtml b/mobile/android/chrome/content/netError.xhtml
index c0833cc4455..3728306ef30 100644
--- a/mobile/android/chrome/content/netError.xhtml
+++ b/mobile/android/chrome/content/netError.xhtml
@@ -24,7 +24,7 @@
     <link rel="stylesheet" href="chrome://global/skin/netError.css" type="text/css" media="all" />
     <!-- If the location of the favicon is changed here, the FAVICON_ERRORPAGE_URL symbol in
          toolkit/components/places/src/nsFaviconService.h should be updated. -->
-    <link rel="icon" type="image/png" id="favicon" sizes="64x64" href="chrome://global/skin/icons/warning-64.png"/>
+    <link rel="icon" type="image/png" id="favicon" href="chrome://global/skin/icons/warning-16.png"/>
 
     <script type="application/javascript"><![CDATA[
       // Error url MUST be formatted like this: