diff --git a/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java b/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java
index 41971dfd48d..2bc200f05ee 100644
--- a/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java
@@ -61,6 +61,7 @@ private void updateFragments() {
                 .commit();
     }
 
+    @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         super.onCreateOptionsMenu(menu);
         MenuInflater inflater = getMenuInflater();
@@ -86,9 +87,4 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 return super.onOptionsItemSelected(item);
         }
     }
-
-    @Override
-    public void onRestoreInstanceState(Bundle inState){
-        super.onRestoreInstanceState(inState);
-    }
 }
diff --git a/app/src/main/java/us/shandian/giga/service/DownloadManager.java b/app/src/main/java/us/shandian/giga/service/DownloadManager.java
index c2bba73966c..b168ef474f2 100644
--- a/app/src/main/java/us/shandian/giga/service/DownloadManager.java
+++ b/app/src/main/java/us/shandian/giga/service/DownloadManager.java
@@ -666,9 +666,9 @@ public boolean[] hasValidPendingMissions() {
                         continue;
 
                     if (mission.running)
-                        paused = true;
-                    else
                         running = true;
+                    else
+                        paused = true;
                 }
             }
 
diff --git a/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java b/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java
index ebc6e94c2de..e53ab4f1f3e 100644
--- a/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java
+++ b/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java
@@ -122,14 +122,8 @@ public void handleMessage(Message msg) {
                         break;
                 }
 
-                if (mStartButton != null && mPauseButton != null) switch (msg.what) {
-                    case DownloadManagerService.MESSAGE_DELETED:
-                    case DownloadManagerService.MESSAGE_ERROR:
-                    case DownloadManagerService.MESSAGE_FINISHED:
-                    case DownloadManagerService.MESSAGE_PAUSED:
-                        checkMasterButtonsVisibility();
-                        break;
-                }
+                if (mStartButton != null && mPauseButton != null)
+                    checkMasterButtonsVisibility();
             }
         };
 
@@ -163,8 +157,7 @@ public void onViewRecycled(@NonNull ViewHolder view) {
             mPendingDownloadsItems.remove(h);
             if (mPendingDownloadsItems.size() < 1) {
                 setAutoRefresh(false);
-                if (mStartButton != null) mStartButton.setVisible(false);
-                if (mPauseButton != null) mPauseButton.setVisible(false);
+                checkMasterButtonsVisibility();
             }
         }
 
@@ -664,11 +657,11 @@ private void checkEmptyMessageVisibility() {
         if (mEmptyMessage.getVisibility() != flag) mEmptyMessage.setVisibility(flag);
     }
 
-    private void checkMasterButtonsVisibility() {
+    public void checkMasterButtonsVisibility() {
         boolean[] state = mIterator.hasValidPendingMissions();
 
-        mStartButton.setVisible(state[0]);
-        mPauseButton.setVisible(state[1]);
+        mPauseButton.setVisible(state[0]);
+        mStartButton.setVisible(state[1]);
     }
 
     public void ensurePausedMissions() {
diff --git a/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java b/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java
index f8cecbed93c..69c8e8f5012 100644
--- a/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java
+++ b/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java
@@ -138,6 +138,7 @@ public void onAttach(Context context) {
      * deprecated in API level 23,
      * but must remain to allow compatibility with api<23
      */
+    @SuppressWarnings("deprecation")
     @Override
     public void onAttach(Activity activity) {
         super.onAttach(activity);
@@ -273,6 +274,7 @@ public void onResume() {
             }
 
             mBinder.addMissionEventListener(mAdapter.getMessenger());
+            mAdapter.checkMasterButtonsVisibility();
         }
         if (mBinder != null) mBinder.enableNotifications(false);
     }
diff --git a/app/src/main/res/menu/download_menu.xml b/app/src/main/res/menu/download_menu.xml
index 4e45499579c..f91f8ad7bfe 100644
--- a/app/src/main/res/menu/download_menu.xml
+++ b/app/src/main/res/menu/download_menu.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
+<menu xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item android:id="@+id/switch_mode"
         android:icon="?attr/ic_grid"
         android:title="@string/grid"
-        app:showAsAction="ifRoom" />
+        tools:ignore="AlwaysShowAction"
+        app:showAsAction="always" />
 
     <item android:id="@+id/start_downloads"
         android:visible="false"