diff --git a/android/src/main/java/com/evollu/react/fcm/InstanceIdService.java b/android/src/main/java/com/evollu/react/fcm/InstanceIdService.java
index f01c160c..bca49229 100644
--- a/android/src/main/java/com/evollu/react/fcm/InstanceIdService.java
+++ b/android/src/main/java/com/evollu/react/fcm/InstanceIdService.java
@@ -11,9 +11,9 @@
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.bridge.ReactContext;
 import com.google.firebase.iid.FirebaseInstanceId;
-import com.google.firebase.iid.FirebaseInstanceIdService;
+import com.google.firebase.messaging.FirebaseMessagingService;
 
-public class InstanceIdService extends FirebaseInstanceIdService {
+public class InstanceIdService extends FirebaseMessagingService {
 
     private static final String TAG = "InstanceIdService";
 
@@ -24,7 +24,7 @@ public class InstanceIdService extends FirebaseInstanceIdService {
      */
     // [START refresh_token]
     @Override
-    public void onTokenRefresh() {
+    public void onNewToken(String token) {
         // Get updated InstanceID token.
         String refreshedToken = FirebaseInstanceId.getInstance().getToken();
         Log.d(TAG, "Refreshed token: " + refreshedToken);
diff --git a/android/src/main/java/com/evollu/react/fcm/SendNotificationTask.java b/android/src/main/java/com/evollu/react/fcm/SendNotificationTask.java
index e04ec12a..47a84691 100644
--- a/android/src/main/java/com/evollu/react/fcm/SendNotificationTask.java
+++ b/android/src/main/java/com/evollu/react/fcm/SendNotificationTask.java
@@ -136,7 +136,7 @@ protected Void doInBackground(Void... params) {
             }
 
             //icon
-            String smallIcon = bundle.getString("icon", "ic_launcher");
+            String smallIcon = bundle.getString("icon", "ic_notif");
             int smallIconResId = res.getIdentifier(smallIcon, "mipmap", packageName);
             if(smallIconResId == 0){
                 smallIconResId = res.getIdentifier(smallIcon, "drawable", packageName);