diff --git a/app/src/debug/res/xml-v25/shortcuts.xml b/app/src/debug/res/xml-v25/shortcuts.xml
index 557a49084..94fab2904 100644
--- a/app/src/debug/res/xml-v25/shortcuts.xml
+++ b/app/src/debug/res/xml-v25/shortcuts.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
+
     <shortcut
         android:shortcutId="start_all"
         android:enabled="true"
@@ -8,11 +9,12 @@
         android:shortcutLongLabel="@string/download_start_all"
         android:shortcutDisabledMessage="@string/download_start_all">
         <intent
-            android:action="android.intent.action.MAIN"
+            android:action="start_all"
             android:targetPackage="com.hippo.ehviewer.debug"
-            android:targetClass="com.hippo.ehviewer.shortcuts.StartAllDownloadActivity" />
-        <categories android:name="android.shortcut.conversation" />
+            android:targetClass="com.hippo.ehviewer.shortcuts.ShortcutsActivity"/>
+        <categories android:name="android.intent.category.DEFAULT" />
     </shortcut>
+
     <shortcut
         android:shortcutId="stop_all"
         android:enabled="true"
@@ -21,10 +23,10 @@
         android:shortcutLongLabel="@string/download_stop_all"
         android:shortcutDisabledMessage="@string/download_stop_all">
         <intent
-            android:action="android.intent.action.MAIN"
+            android:action="stop_all"
             android:targetPackage="com.hippo.ehviewer.debug"
-            android:targetClass="com.hippo.ehviewer.shortcuts.StopAllDownloadActivity" />
-        <categories android:name="android.shortcut.conversation" />
+            android:targetClass="com.hippo.ehviewer.shortcuts.ShortcutsActivity" />
+        <categories android:name="android.intent.category.DEFAULT" />
     </shortcut>
 
 </shortcuts>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b87814782..bda00cc8a 100755
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -148,15 +148,7 @@
           android:label="@string/hosts"/>
 
         <activity
-            android:name="com.hippo.ehviewer.shortcuts.StartAllDownloadActivity"
-            android:theme="@android:style/Theme.Translucent.NoTitleBar"
-            android:excludeFromRecents="true"
-            android:taskAffinity=""
-            android:process=":bg"
-            android:launchMode="singleTask">
-        </activity>
-
-        <activity android:name="com.hippo.ehviewer.shortcuts.StopAllDownloadActivity"
+            android:name="com.hippo.ehviewer.shortcuts.ShortcutsActivity"
             android:theme="@android:style/Theme.Translucent.NoTitleBar"
             android:excludeFromRecents="true"
             android:taskAffinity=""
diff --git a/app/src/main/java/com/hippo/ehviewer/shortcuts/StartAllDownloadActivity.java b/app/src/main/java/com/hippo/ehviewer/shortcuts/ShortcutsActivity.java
similarity index 59%
rename from app/src/main/java/com/hippo/ehviewer/shortcuts/StartAllDownloadActivity.java
rename to app/src/main/java/com/hippo/ehviewer/shortcuts/ShortcutsActivity.java
index 6cec580a9..453f7077e 100644
--- a/app/src/main/java/com/hippo/ehviewer/shortcuts/StartAllDownloadActivity.java
+++ b/app/src/main/java/com/hippo/ehviewer/shortcuts/ShortcutsActivity.java
@@ -19,6 +19,8 @@ package com.hippo.ehviewer.shortcuts;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
+import android.util.Log;
+import android.widget.Toast;
 
 import com.hippo.ehviewer.download.DownloadService;
 
@@ -26,13 +28,23 @@ import com.hippo.ehviewer.download.DownloadService;
  * Created by onlymash on 3/25/18.
  */
 
-public class StartAllDownloadActivity extends Activity{
+public class ShortcutsActivity extends Activity{
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        Intent intent = new Intent(this, DownloadService.class);
-        intent.setAction(DownloadService.ACTION_START_ALL);
-        startService(intent);
+        String action = null;
+        action = getIntent().getAction();
+        if (!action.isEmpty()){
+            Intent intent = new Intent(this, DownloadService.class);
+            if (action.equals(DownloadService.ACTION_START_ALL)){
+                intent.setAction(DownloadService.ACTION_START_ALL);
+                startService(intent);
+            }
+            if (action.equals(DownloadService.ACTION_STOP_ALL)){
+                intent.setAction(DownloadService.ACTION_STOP_ALL);
+                startService(intent);
+            }
+        }
         finish();
     }
 }
diff --git a/app/src/main/java/com/hippo/ehviewer/shortcuts/StopAllDownloadActivity.java b/app/src/main/java/com/hippo/ehviewer/shortcuts/StopAllDownloadActivity.java
deleted file mode 100644
index befb5c16e..000000000
--- a/app/src/main/java/com/hippo/ehviewer/shortcuts/StopAllDownloadActivity.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2018 Hippo Seven
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.hippo.ehviewer.shortcuts;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-
-import com.hippo.ehviewer.download.DownloadService;
-
-/**
- * Created by onlymash on 3/25/18.
- */
-
-public class StopAllDownloadActivity extends Activity {
-
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        stopService(new Intent(this, DownloadService.class));
-        finish();
-    }
-}
diff --git a/app/src/main/res/xml-v25/shortcuts.xml b/app/src/main/res/xml-v25/shortcuts.xml
index 35ebc94df..998ac355c 100644
--- a/app/src/main/res/xml-v25/shortcuts.xml
+++ b/app/src/main/res/xml-v25/shortcuts.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
+
     <shortcut
         android:shortcutId="start_all"
         android:enabled="true"
@@ -8,11 +9,12 @@
         android:shortcutLongLabel="@string/download_start_all"
         android:shortcutDisabledMessage="@string/download_start_all">
         <intent
-            android:action="android.intent.action.MAIN"
+            android:action="start_all"
             android:targetPackage="com.hippo.ehviewer"
-            android:targetClass="com.hippo.ehviewer.shortcuts.StartAllDownloadActivity" />
-        <categories android:name="android.shortcut.conversation" />
+            android:targetClass="com.hippo.ehviewer.shortcuts.ShortcutsActivity"/>
+        <categories android:name="android.intent.category.DEFAULT" />
     </shortcut>
+
     <shortcut
         android:shortcutId="stop_all"
         android:enabled="true"
@@ -21,10 +23,10 @@
         android:shortcutLongLabel="@string/download_stop_all"
         android:shortcutDisabledMessage="@string/download_stop_all">
         <intent
-            android:action="android.intent.action.MAIN"
+            android:action="stop_all"
             android:targetPackage="com.hippo.ehviewer"
-            android:targetClass="com.hippo.ehviewer.shortcuts.StopAllDownloadActivity" />
-        <categories android:name="android.shortcut.conversation" />
+            android:targetClass="com.hippo.ehviewer.shortcuts.ShortcutsActivity" />
+        <categories android:name="android.intent.category.DEFAULT" />
     </shortcut>
 
-</shortcuts>
+</shortcuts>
\ No newline at end of file