diff --git a/app/build.gradle b/app/build.gradle
index 2738be93..76cd1f2f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -150,7 +150,8 @@ dependencies {
     implementation "com.google.firebase:firebase-database:${gms}"
     implementation('com.github.b3er.rxfirebase:firebase-database-kotlin:11.2.0') { transitive = false }
     implementation('com.github.b3er.rxfirebase:firebase-database:11.2.0') { transitive = false }
-    implementation 'com.github.k0shk0sh:firebase-jobdispatcher-android:v0.7.0'
+    implementation 'com.github.k0shk0sh.firebase-jobdispatcher-android:firebase-jobdispatcher:v0.7.0'
+    implementation 'com.github.k0shk0sh.firebase-jobdispatcher-android:firebase-jobdispatcher-with-gcm-dep:v0.7.0'
     implementation('com.crashlytics.sdk.android:crashlytics:2.6.8@aar') { transitive = true }
     implementation "com.github.miguelbcr:RxBillingService:0.0.3"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index e6d7b589..36bc2bfe 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -20,11 +20,7 @@
 -keep class butterknife.*
 -keepclasseswithmembernames class * { @butterknife.* <methods>; }
 -keepclasseswithmembernames class * { @butterknife.* <fields>; }
--dontwarn retrofit.**
 -keep class retrofit.** { *; }
--dontwarn sun.misc.Unsafe
--dontwarn com.octo.android.robospice.retrofit.RetrofitJackson**
--dontwarn retrofit.appengine.UrlFetchClient
 -keepattributes Signature
 -keepattributes Exceptions
 -keepclasseswithmembers class * {
@@ -37,19 +33,6 @@
 -keep class retrofit.** { *; }
 -keep class com.squareup.okhttp.** { *; }
 -keep interface com.squareup.okhttp.** { *; }
--dontwarn java.beans.**
--dontwarn javax.**
--dontwarn lombok.**
--dontwarn java.lang.invoke.*
--dontwarn rx.**
--dontwarn com.squareup.okhttp.**
--dontwarn okio.**
--dontwarn org.apache.**
--dontwarn android.net.http.AndroidHttpClient
--dontwarn retrofit.**
--dontwarn retrofit2.adapter.rxjava.CompletableHelper$**
--dontwarn retrofit2.Platform$Java8
--dontwarn sun.misc.**
 -keepclassmembers class rx.internal.util.unsafe.*ArrayQueue*Field* {
    long producerIndex;
    long consumerIndex;
@@ -66,7 +49,6 @@
  public static **[] values();
  public static ** valueOf(java.lang.String);
 }
--dontwarn icepick.**
 -keep class **$$Icepick { *; }
 -keepclasseswithmembernames class * {
     @icepick.* <fields>;
@@ -76,6 +58,22 @@
 -keepclassmembers class com.prettifier.pretty.callback.MarkDownInterceptorInterface {
    public *;
 }
+-keepclassmembers enum io.requery.** {
+    public static **[] values();
+    public static ** valueOf(java.lang.String);
+}
+-keep class .R
+-keep class **.R$* {
+    <fields>;
+}
+-keep class net.nightwhistler.** { *; }
+-keep class org.htmlcleaner.** { *; }
+-keeppackagenames org.jsoup.nodes
+-keep class com.github.b3er.** { *; }
+-keep class com.memoizrlabs.** { *; }
+
+-dontwarn com.github.b3er.**
+-dontwarn com.memoizrlabs.**
 -dontwarn java.lang.FunctionalInterface
 -dontwarn java.util.**
 -dontwarn java.time.**
@@ -93,17 +91,6 @@
 -dontwarn io.requery.query.**
 -dontwarn io.requery.android.sqlcipher.**
 -dontwarn io.requery.android.sqlitex.**
--keepclassmembers enum io.requery.** {
-    public static **[] values();
-    public static ** valueOf(java.lang.String);
-}
--keep class .R
--keep class **.R$* {
-    <fields>;
-}
-
--keep class net.nightwhistler.** { *; }
--keep class org.htmlcleaner.** { *; }
 -dontwarn org.jaxen.**
 -dontwarn org.jdom.**
 -dontwarn com.google.android.gms.**
@@ -121,8 +108,21 @@
 -dontwarn kotlin.reflect.jvm.internal.impl.types.DescriptorSubstitutor
 -dontwarn kotlin.reflect.jvm.internal.impl.types.DescriptorSubstitutor
 -dontwarn kotlin.reflect.jvm.internal.impl.types.TypeConstructor
--keeppackagenames org.jsoup.nodes
--keep class com.github.b3er.** { *; }
--keep class com.memoizrlabs.** { *; }
--dontwarn com.github.b3er.**
--dontwarn com.memoizrlabs.**
\ No newline at end of file
+-dontwarn java.beans.**
+-dontwarn javax.**
+-dontwarn lombok.**
+-dontwarn java.lang.invoke.*
+-dontwarn rx.**
+-dontwarn com.squareup.okhttp.**
+-dontwarn okio.**
+-dontwarn org.apache.**
+-dontwarn android.net.http.AndroidHttpClient
+-dontwarn retrofit.**
+-dontwarn retrofit2.adapter.rxjava.CompletableHelper$**
+-dontwarn retrofit2.Platform$Java8
+-dontwarn sun.misc.**
+-dontwarn sun.misc.Unsafe
+-dontwarn com.octo.android.robospice.retrofit.RetrofitJackson**
+-dontwarn retrofit.appengine.UrlFetchClient
+-dontwarn icepick.**
+-dontwarn retrofit.**
\ No newline at end of file
diff --git a/app/src/main/java/com/fastaccess/provider/tasks/notification/NotificationSchedulerJobTask.java b/app/src/main/java/com/fastaccess/provider/tasks/notification/NotificationSchedulerJobTask.java
index 84eaadee..437a0abb 100644
--- a/app/src/main/java/com/fastaccess/provider/tasks/notification/NotificationSchedulerJobTask.java
+++ b/app/src/main/java/com/fastaccess/provider/tasks/notification/NotificationSchedulerJobTask.java
@@ -77,8 +77,6 @@ public class NotificationSchedulerJobTask extends JobService {
                             finishJob(job);
                         }
                     }, throwable -> jobFinished(job, true));
-        } else {
-            finishJob(job);
         }
         return true;
     }
@@ -189,7 +187,7 @@ public class NotificationSchedulerJobTask extends JobService {
     }
 
     private void finishJob(JobParameters job) {
-        jobFinished(job, false);
+//        jobFinished(job, false);
     }
 
     private void showNotificationWithoutComment(Context context, int accentColor, Notification thread, String iconUrl) {
diff --git a/app/src/main/java/com/fastaccess/provider/tasks/version/CheckVersionService.kt b/app/src/main/java/com/fastaccess/provider/tasks/version/CheckVersionService.kt
index 9c4a65bd..4f28bd14 100644
--- a/app/src/main/java/com/fastaccess/provider/tasks/version/CheckVersionService.kt
+++ b/app/src/main/java/com/fastaccess/provider/tasks/version/CheckVersionService.kt
@@ -5,6 +5,7 @@ import android.content.Intent
 import android.widget.Toast
 import com.fastaccess.BuildConfig
 import com.fastaccess.R
+import com.fastaccess.data.dao.model.Release
 import com.fastaccess.helper.RxHelper
 import com.fastaccess.provider.rest.RestProvider
 
@@ -16,8 +17,8 @@ class CheckVersionService : IntentService("CheckVersionService") {
     override fun onHandleIntent(p0: Intent?) {
         RxHelper.getObservable(RestProvider.getRepoService(false)
                 .getLatestRelease("k0shk0sh", "FastHub"))
-                .subscribe({
-                    if (it != null) {
+                .subscribe({ t: Release? ->
+                    t?.let {
                         Toast.makeText(this, if (BuildConfig.VERSION_NAME.contains(it.tagName))
                             R.string.up_to_date else R.string.new_version, Toast.LENGTH_LONG).show()
                     }
diff --git a/app/src/main/res/drawable-hdpi/ic_shortcut_pull_request.png b/app/src/main/res/drawable-hdpi/ic_shortcut_pull_request.png
index c03f4a2f..2aeae04d 100755
Binary files a/app/src/main/res/drawable-hdpi/ic_shortcut_pull_request.png and b/app/src/main/res/drawable-hdpi/ic_shortcut_pull_request.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_shortcut_pull_request.png b/app/src/main/res/drawable-mdpi/ic_shortcut_pull_request.png
index 1db171a4..387efa8b 100755
Binary files a/app/src/main/res/drawable-mdpi/ic_shortcut_pull_request.png and b/app/src/main/res/drawable-mdpi/ic_shortcut_pull_request.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_shortcut_pull_request.png b/app/src/main/res/drawable-xhdpi/ic_shortcut_pull_request.png
index abcd18c0..21c76cc1 100755
Binary files a/app/src/main/res/drawable-xhdpi/ic_shortcut_pull_request.png and b/app/src/main/res/drawable-xhdpi/ic_shortcut_pull_request.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_shortcut_pull_request.png b/app/src/main/res/drawable-xxhdpi/ic_shortcut_pull_request.png
index e246e7f2..8e87e259 100755
Binary files a/app/src/main/res/drawable-xxhdpi/ic_shortcut_pull_request.png and b/app/src/main/res/drawable-xxhdpi/ic_shortcut_pull_request.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_shortcut_pull_request.png b/app/src/main/res/drawable-xxxhdpi/ic_shortcut_pull_request.png
index ceeeabb7..a55e5bb0 100755
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_shortcut_pull_request.png and b/app/src/main/res/drawable-xxxhdpi/ic_shortcut_pull_request.png differ
diff --git a/build.gradle b/build.gradle
index 7ca8561b..665f99d7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,7 +15,7 @@ buildscript {
         assertjVersion = '2.5.0'
         espresseVersion = '2.2.2'
         requery = '1.3.2'
-        kotlin_version = '1.1.2-5'
+        kotlin_version = '1.1.3-2'
     }
 
     repositories {