diff --git a/app/src/amazon/res/values/keys.xml b/app/src/amazon/res/values/keys.xml
index 83393b812..212909c25 100644
--- a/app/src/amazon/res/values/keys.xml
+++ b/app/src/amazon/res/values/keys.xml
@@ -2,4 +2,5 @@
 <resources>
   <string name="sku_themes">themes</string>
   <string name="common_google_play_services_notification_ticker">Google Play services error</string>
+  <string name="market_url">amzn://apps/android?p=org.tasks</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/generic/res/values/keys.xml b/app/src/generic/res/values/keys.xml
index 83393b812..5c07e6cd3 100644
--- a/app/src/generic/res/values/keys.xml
+++ b/app/src/generic/res/values/keys.xml
@@ -2,4 +2,5 @@
 <resources>
   <string name="sku_themes">themes</string>
   <string name="common_google_play_services_notification_ticker">Google Play services error</string>
+  <string name="market_url">https://f-droid.org/en/packages/org.tasks/</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/googleplay/res/values/keys.xml b/app/src/googleplay/res/values/keys.xml
index 133f35ea4..ba0548e15 100644
--- a/app/src/googleplay/res/values/keys.xml
+++ b/app/src/googleplay/res/values/keys.xml
@@ -2,4 +2,5 @@
 <resources>
   <string name="gp_key">MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk8mXRE3dDXwtinUILCEzKjov2rxs3kZbLRzNrcjFWXpG9OEsUzRGLzqEN+WwibVuMRpZLj/+IxbU2sJWq/M0q+90rOhmXn46ZPeNyr77IqX2pWKIAWpzBoWq/mshRwtm9m1FIiGdBNlXrhSE7u3TGB5FuEuuSqKWvWzxeqQ7fHmlM04Lqrh1mN3FaMne8rWv+DWVHDbLrtnXBuC36glOAj17HxrzaE2v6Pv7Df3QefJ3rM1+0fAp/5jNInaP0qHAlG8WTbUmDShQ5kG3urbv3HLByyx6TSqhmNudXUK/6TusvIj50OptAG7x+UFYf956dD3diXhY3yoICvyFWx1sNwIDAQAB</string>
   <string name="play_services_available">play_services_available</string>
+  <string name="market_url">market://details?id=org.tasks</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/java/org/tasks/preferences/BasicPreferences.java b/app/src/main/java/org/tasks/preferences/BasicPreferences.java
index 9e4a24d16..38d09d9dd 100644
--- a/app/src/main/java/org/tasks/preferences/BasicPreferences.java
+++ b/app/src/main/java/org/tasks/preferences/BasicPreferences.java
@@ -196,6 +196,14 @@ public class BasicPreferences extends InjectingPreferenceActivity
           }
         });
 
+    findPreference(R.string.rate_tasks)
+        .setOnPreferenceClickListener(
+            preference -> {
+              startActivity(
+                  new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.market_url))));
+              return false;
+            });
+
     Preference upgradeToPro = findPreference(R.string.upgrade_to_pro);
     if (inventory.hasPro()) {
       upgradeToPro.setTitle(R.string.manage_subscription);
@@ -232,8 +240,7 @@ public class BasicPreferences extends InjectingPreferenceActivity
     requires(BuildConfig.DEBUG, R.string.debug);
 
     //noinspection ConstantConditions
-    if (!BuildConfig.FLAVOR.equals("googleplay")) {
-      requires(R.string.backup_BPr_header, false, R.string.p_google_drive_backup);
+    if (BuildConfig.FLAVOR.equals("generic")) {
       requires(
           R.string.about,
           false,
@@ -241,6 +248,11 @@ public class BasicPreferences extends InjectingPreferenceActivity
           R.string.upgrade_to_pro,
           R.string.refresh_purchases);
       requires(R.string.privacy, false, R.string.p_collect_statistics);
+    }
+
+    //noinspection ConstantConditions
+    if (!BuildConfig.FLAVOR.equals("googleplay")) {
+      requires(R.string.backup_BPr_header, false, R.string.p_google_drive_backup);
       ((PreferenceScreen) findPreference(getString(R.string.preference_screen)))
           .removePreference(findPreference(getString(R.string.TEA_control_location)));
     }
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index efa7985f9..8455d74f5 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -142,11 +142,7 @@
 
     <Preference
       android:key="@string/rate_tasks"
-      android:title="@string/rate_tasks">
-      <intent
-        android:action="android.intent.action.VIEW"
-        android:data="market://details?id=org.tasks"/>
-    </Preference>
+      android:title="@string/rate_tasks"/>
 
     <Preference
       android:key="@string/upgrade_to_pro"