diff --git a/Gruntfile.js b/Gruntfile.js
index 1092b3de2..0dd880f37 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -372,7 +372,7 @@ module.exports = function(grunt) {
 
   // Build android
   grunt.registerTask('start-android', ['build-android-debug', 'exec:run_android']);
-  grunt.registerTask('build-android-debug', ['exec:build_android_debug']);
+  grunt.registerTask('build-android-debug', ['default', 'exec:build_android_debug']);
   grunt.registerTask('start-android-emulator', ['build-android-debug', 'exec:run_android_emulator']);
   grunt.registerTask('build-android-release', ['prod', 'exec:build_android_release', 'sign-android']);
   grunt.registerTask('sign-android', ['exec:sign_android']);
diff --git a/app-template/config-template.xml b/app-template/config-template.xml
index 8686b7b36..3d9cb38f6 100644
--- a/app-template/config-template.xml
+++ b/app-template/config-template.xml
@@ -142,6 +142,13 @@
       <icon src="resources/*PACKAGENAME*/android/icon/drawable-xxhdpi-icon.png" density="xxhdpi" />
       <icon src="resources/*PACKAGENAME*/android/icon/drawable-xxxhdpi-icon.png" density="xxxhdpi" />
 
+      <resource-file src="resources/bitcoin.com/android/fcm_push_icon/drawable-ldpi/fcm_push_icon.png" target="res/drawable-ldpi/fcm_push_icon.png" />
+      <resource-file src="resources/bitcoin.com/android/fcm_push_icon/drawable-mdpi/fcm_push_icon.png" target="res/drawable-mdpi/fcm_push_icon.png" />
+      <resource-file src="resources/bitcoin.com/android/fcm_push_icon/drawable-hdpi/fcm_push_icon.png" target="res/drawable-hdpi/fcm_push_icon.png" />
+      <resource-file src="resources/bitcoin.com/android/fcm_push_icon/drawable-xhdpi/fcm_push_icon.png" target="res/drawable-xhdpi/fcm_push_icon.png" />
+      <resource-file src="resources/bitcoin.com/android/fcm_push_icon/drawable-xxhdpi/fcm_push_icon.png" target="res/drawable-xxhdpi/fcm_push_icon.png" />
+      <resource-file src="resources/bitcoin.com/android/fcm_push_icon/drawable-xxxhdpi/fcm_push_icon.png" target="res/drawable-xxxhdpi/fcm_push_icon.png" />
+
       <splash src="resources/*PACKAGENAME*/android/splash/drawable-land-hdpi-screen.png" density="land-hdpi"/>
       <splash src="resources/*PACKAGENAME*/android/splash/drawable-land-ldpi-screen.png" density="land-ldpi"/>
       <splash src="resources/*PACKAGENAME*/android/splash/drawable-land-mdpi-screen.png" density="land-mdpi"/>
diff --git a/app-template/package-template.json b/app-template/package-template.json
index 11b15bfcd..d3fd9670d 100644
--- a/app-template/package-template.json
+++ b/app-template/package-template.json
@@ -126,7 +126,7 @@
     "start":                  "npm run build:www && ionic serve --nolivereload --nogulp -s --address 0.0.0.0",
     "start:chrome":           "npm run build:www && ionic serve --nolivereload --nogulp -s --address 0.0.0.0 --browser \"google chrome\"",
     "start:android":          "grunt start-android",
-    "start:android-emulator": "grunt start-android",
+    "start:android-emulator": "grunt start-android-emulator",
     "start:android-log":      "grunt start-android && npm run log:android",
     "start:ios":              "grunt start-ios",
     "start:windows":          "npm run build:www && npm run build:windows",
diff --git a/resources/bitcoin.com/android/fcm_push_icon/drawable-hdpi/fcm_push_icon.png b/resources/bitcoin.com/android/fcm_push_icon/drawable-hdpi/fcm_push_icon.png
new file mode 100755
index 000000000..6044abbea
Binary files /dev/null and b/resources/bitcoin.com/android/fcm_push_icon/drawable-hdpi/fcm_push_icon.png differ
diff --git a/resources/bitcoin.com/android/fcm_push_icon/drawable-ldpi/fcm_push_icon.png b/resources/bitcoin.com/android/fcm_push_icon/drawable-ldpi/fcm_push_icon.png
new file mode 100755
index 000000000..6c50d78c8
Binary files /dev/null and b/resources/bitcoin.com/android/fcm_push_icon/drawable-ldpi/fcm_push_icon.png differ
diff --git a/resources/bitcoin.com/android/fcm_push_icon/drawable-mdpi/fcm_push_icon.png b/resources/bitcoin.com/android/fcm_push_icon/drawable-mdpi/fcm_push_icon.png
new file mode 100755
index 000000000..d7f09f064
Binary files /dev/null and b/resources/bitcoin.com/android/fcm_push_icon/drawable-mdpi/fcm_push_icon.png differ
diff --git a/resources/bitcoin.com/android/fcm_push_icon/drawable-xhdpi/fcm_push_icon.png b/resources/bitcoin.com/android/fcm_push_icon/drawable-xhdpi/fcm_push_icon.png
new file mode 100755
index 000000000..1c704ccbb
Binary files /dev/null and b/resources/bitcoin.com/android/fcm_push_icon/drawable-xhdpi/fcm_push_icon.png differ
diff --git a/resources/bitcoin.com/android/fcm_push_icon/drawable-xxhdpi/fcm_push_icon.png b/resources/bitcoin.com/android/fcm_push_icon/drawable-xxhdpi/fcm_push_icon.png
new file mode 100755
index 000000000..3b62e516b
Binary files /dev/null and b/resources/bitcoin.com/android/fcm_push_icon/drawable-xxhdpi/fcm_push_icon.png differ
diff --git a/resources/bitcoin.com/android/fcm_push_icon/drawable-xxxhdpi/fcm_push_icon.png b/resources/bitcoin.com/android/fcm_push_icon/drawable-xxxhdpi/fcm_push_icon.png
new file mode 100755
index 000000000..da2e90cdf
Binary files /dev/null and b/resources/bitcoin.com/android/fcm_push_icon/drawable-xxxhdpi/fcm_push_icon.png differ
diff --git a/resources/bitcoin.com/android/icon-1024-fcm.xcf b/resources/bitcoin.com/android/icon-1024-fcm.xcf
new file mode 100644
index 000000000..a7c4374d3
Binary files /dev/null and b/resources/bitcoin.com/android/icon-1024-fcm.xcf differ
diff --git a/src/js/services/wallet-history.service.js b/src/js/services/wallet-history.service.js
index 7a6f18a13..d8995989a 100644
--- a/src/js/services/wallet-history.service.js
+++ b/src/js/services/wallet-history.service.js
@@ -45,7 +45,7 @@
         });
 
         var overlappingTxFraction = overlappingTxsCount / Math.min(cachedTxs.length, PAGE_OVERLAP);
-        console.log('overlappingTxFraction:', overlappingTxFraction);
+        console.log('overlappingTxFraction: ' + overlappingTxFraction);
 
         if (overlappingTxFraction >= MIN_KNOWN_TX_OVERLAP_FRACTION) { // We are good
           if (someTransactionsWereNew) {