diff --git a/Simplenote/src/main/AndroidManifest.xml b/Simplenote/src/main/AndroidManifest.xml
index 7e5df703d..abfa29197 100644
--- a/Simplenote/src/main/AndroidManifest.xml
+++ b/Simplenote/src/main/AndroidManifest.xml
@@ -41,7 +41,7 @@
         </activity>
 
         <activity
-            android:name="com.automattic.simplenote.NotesActivity"
+            android:name=".NotesActivity"
             android:configChanges="screenSize|smallestScreenSize|orientation|screenLayout"
             android:label="@string/app_launcher_name"
             android:resizeableActivity="true"
@@ -93,6 +93,40 @@
 
         </activity>
 
+        <activity-alias android:label="@string/app_name"
+            android:enabled="false"
+            android:exported="true"
+            android:icon="@mipmap/ic_launcher_green"
+            android:name=".NotesActivitySustainerAlias"
+            android:targetActivity=".NotesActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.SEND" />
+                <action android:name="com.google.android.gm.action.AUTO_SEND" />
+                <action android:name="com.google.android.voicesearch.action.AUTO_SEND" />
+                <action android:name="com.automattic.simplenote.NEW_NOTE" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="com.google.android.voicesearch.SELF_NOTE" />
+                <data android:mimeType="text/*" />
+            </intent-filter>
+
+            <intent-filter
+                android:autoVerify="true">
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data
+                    android:host="app.simplenote.com"
+                    android:pathPattern="/account/.*/reset?redirect=simplenote://launch"
+                    android:scheme="https">
+                </data>
+            </intent-filter>
+        </activity-alias>
+
         <activity
             android:name="com.automattic.simplenote.NoteEditorActivity"
             android:configChanges="screenSize|smallestScreenSize|orientation|screenLayout"
diff --git a/Simplenote/src/main/java/com/automattic/simplenote/CollaboratorsActivity.kt b/Simplenote/src/main/java/com/automattic/simplenote/CollaboratorsActivity.kt
index e61e65142..2838e2a59 100644
--- a/Simplenote/src/main/java/com/automattic/simplenote/CollaboratorsActivity.kt
+++ b/Simplenote/src/main/java/com/automattic/simplenote/CollaboratorsActivity.kt
@@ -15,6 +15,7 @@ import com.automattic.simplenote.databinding.ActivityCollaboratorsBinding
 import com.automattic.simplenote.utils.CollaboratorsAdapter
 import com.automattic.simplenote.utils.CollaboratorsAdapter.*
 import com.automattic.simplenote.utils.CollaboratorsAdapter.CollaboratorDataItem.*
+import com.automattic.simplenote.utils.IntentUtils
 import com.automattic.simplenote.utils.toast
 import com.automattic.simplenote.viewmodels.CollaboratorsViewModel
 import com.automattic.simplenote.viewmodels.CollaboratorsViewModel.Event
@@ -157,7 +158,7 @@ class CollaboratorsActivity : ThemedAppCompatActivity() {
     }
 
     private fun navigateToNotesList() {
-        val intent = Intent(applicationContext, NotesActivity::class.java)
+        val intent = IntentUtils.maybeAliasedIntent(applicationContext)
         intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP
         startActivity(intent)
     }
diff --git a/Simplenote/src/main/java/com/automattic/simplenote/DeepLinkActivity.java b/Simplenote/src/main/java/com/automattic/simplenote/DeepLinkActivity.java
index 8c81c722c..36675c287 100644
--- a/Simplenote/src/main/java/com/automattic/simplenote/DeepLinkActivity.java
+++ b/Simplenote/src/main/java/com/automattic/simplenote/DeepLinkActivity.java
@@ -8,6 +8,8 @@
 import androidx.appcompat.app.AppCompatActivity;
 
 import com.automattic.simplenote.utils.AuthUtils;
+import com.automattic.simplenote.utils.IntentUtils;
+import com.automattic.simplenote.utils.WidgetUtils;
 
 import net.openid.appauth.RedirectUriReceiverActivity;
 
@@ -26,7 +28,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
             intent.setData(uri);
             startActivity(intent);
         } else if (uri.getHost().equals(LOGIN_SCHEME)) {
-            Intent intent = new Intent(this, NotesActivity.class);
+            Intent intent = IntentUtils.maybeAliasedIntent(getApplicationContext());
             Simplenote app = (Simplenote) getApplication();
             String email = AuthUtils.extractEmailFromMagicLink(uri);
             if (app.isLoggedIn() &&
diff --git a/Simplenote/src/main/java/com/automattic/simplenote/NoteEditorActivity.java b/Simplenote/src/main/java/com/automattic/simplenote/NoteEditorActivity.java
index 4efdbf737..e0252846d 100644
--- a/Simplenote/src/main/java/com/automattic/simplenote/NoteEditorActivity.java
+++ b/Simplenote/src/main/java/com/automattic/simplenote/NoteEditorActivity.java
@@ -34,7 +34,9 @@
 import com.automattic.simplenote.utils.AppLog;
 import com.automattic.simplenote.utils.AppLog.Type;
 import com.automattic.simplenote.utils.DisplayUtils;
+import com.automattic.simplenote.utils.IntentUtils;
 import com.automattic.simplenote.utils.NetworkUtils;
+import com.automattic.simplenote.utils.WidgetUtils;
 import com.automattic.simplenote.widgets.NoteEditorViewPager;
 import com.automattic.simplenote.widgets.RobotoMediumTextView;
 import com.google.android.material.tabs.TabLayout;
@@ -241,7 +243,7 @@ private void handleBackPressed() {
             // The editor can be the task root when it comes from an action on a widget
             // In these cases, instead of going to the home screen, the notes activity
             // is started
-            Intent intent = new Intent(getApplicationContext(), NotesActivity.class);
+            Intent intent = IntentUtils.maybeAliasedIntent(getApplicationContext());
             intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
             startActivity(intent);
 
diff --git a/Simplenote/src/main/java/com/automattic/simplenote/NoteListWidgetDark.java b/Simplenote/src/main/java/com/automattic/simplenote/NoteListWidgetDark.java
index 327917111..a80306321 100644
--- a/Simplenote/src/main/java/com/automattic/simplenote/NoteListWidgetDark.java
+++ b/Simplenote/src/main/java/com/automattic/simplenote/NoteListWidgetDark.java
@@ -23,6 +23,7 @@
 
 import com.automattic.simplenote.analytics.AnalyticsTracker;
 import com.automattic.simplenote.models.Note;
+import com.automattic.simplenote.utils.IntentUtils;
 import com.automattic.simplenote.utils.PrefUtils;
 import com.simperium.Simperium;
 import com.simperium.client.Bucket;
@@ -112,14 +113,14 @@ private void updateWidget(Context context, AppWidgetManager appWidgetManager, in
 
         if (user.getStatus().equals(User.Status.NOT_AUTHORIZED)) {
             // Create intent to navigate to notes activity which redirects to login on widget click
-            Intent intent = new Intent(context, NotesActivity.class);
+            Intent intent = IntentUtils.maybeAliasedIntent(context);
             intent.putExtra(KEY_LIST_WIDGET_CLICK, NOTE_LIST_WIDGET_SIGN_IN_TAPPED);
             intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
             PendingIntent pendingIntent = PendingIntent.getActivity(context, appWidgetId, intent, PendingIntent.FLAG_IMMUTABLE);
             views.setOnClickPendingIntent(R.id.widget_layout, pendingIntent);
 
             // Reset intent to navigate to note editor on note list add button click to navigate to notes activity, which redirects to login/signup
-            Intent intentButton = new Intent(context, NotesActivity.class);
+            Intent intentButton = IntentUtils.maybeAliasedIntent(context);
             views.setOnClickPendingIntent(R.id.widget_button, PendingIntent.getActivity(context, appWidgetId, intentButton, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE));
 
             views.setTextViewText(R.id.widget_text, context.getResources().getString(R.string.log_in_use_widget));
@@ -136,7 +137,7 @@ private void updateWidget(Context context, AppWidgetManager appWidgetManager, in
 
             if (cursor.getCount() > 0) {
                 // Create intent to navigate to notes activity on widget click while loading
-                Intent intentLoading = new Intent(context, NotesActivity.class);
+                Intent intentLoading = IntentUtils.maybeAliasedIntent(context);
                 intentLoading.putExtra(KEY_LIST_WIDGET_CLICK, NOTE_LIST_WIDGET_TAPPED);
                 intentLoading.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
                 PendingIntent pendingIntentLoading = PendingIntent.getActivity(context, appWidgetId, intentLoading, PendingIntent.FLAG_IMMUTABLE);
@@ -159,7 +160,7 @@ private void updateWidget(Context context, AppWidgetManager appWidgetManager, in
                 views.setPendingIntentTemplate(R.id.widget_list, pendingIntentItem);
 
                 // Create intent to navigate to note editor on note list add button click
-                Intent intentButton = new Intent(context, NotesActivity.class);
+                Intent intentButton = IntentUtils.maybeAliasedIntent(context);
                 intentButton.putExtra(KEY_LIST_WIDGET_CLICK, NOTE_LIST_WIDGET_BUTTON_TAPPED);
                 intentButton.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
                 PendingIntent pendingIntentButton = PendingIntent.getActivity(context, appWidgetId, intentButton, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
@@ -172,14 +173,14 @@ private void updateWidget(Context context, AppWidgetManager appWidgetManager, in
                 views.setViewVisibility(R.id.widget_list, View.VISIBLE);
             } else {
                 // Create intent to navigate to notes activity on widget click
-                Intent intent = new Intent(context, NotesActivity.class);
+                Intent intent = IntentUtils.maybeAliasedIntent(context);
                 intent.putExtra(KEY_LIST_WIDGET_CLICK, NOTE_LIST_WIDGET_TAPPED);
                 intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
                 PendingIntent pendingIntent = PendingIntent.getActivity(context, appWidgetId, intent, PendingIntent.FLAG_IMMUTABLE);
                 views.setOnClickPendingIntent(R.id.widget_layout, pendingIntent);
 
                 // Create intent to navigate to note editor on note list add button click
-                Intent intentButton = new Intent(context, NotesActivity.class);
+                Intent intentButton = IntentUtils.maybeAliasedIntent(context);
                 intentButton.putExtra(KEY_LIST_WIDGET_CLICK, NOTE_LIST_WIDGET_BUTTON_TAPPED);
                 intentButton.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
                 PendingIntent pendingIntentButton = PendingIntent.getActivity(context, appWidgetId, intentButton, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
diff --git a/Simplenote/src/main/java/com/automattic/simplenote/NoteListWidgetLight.java b/Simplenote/src/main/java/com/automattic/simplenote/NoteListWidgetLight.java
index e49fdcce2..d80dc222d 100644
--- a/Simplenote/src/main/java/com/automattic/simplenote/NoteListWidgetLight.java
+++ b/Simplenote/src/main/java/com/automattic/simplenote/NoteListWidgetLight.java
@@ -23,6 +23,7 @@
 
 import com.automattic.simplenote.analytics.AnalyticsTracker;
 import com.automattic.simplenote.models.Note;
+import com.automattic.simplenote.utils.IntentUtils;
 import com.automattic.simplenote.utils.PrefUtils;
 import com.simperium.Simperium;
 import com.simperium.client.Bucket;
@@ -112,14 +113,14 @@ private void updateWidget(Context context, AppWidgetManager appWidgetManager, in
 
         if (user.getStatus().equals(User.Status.NOT_AUTHORIZED)) {
             // Create intent to navigate to notes activity which redirects to login on widget click
-            Intent intent = new Intent(context, NotesActivity.class);
+            Intent intent = IntentUtils.maybeAliasedIntent(context);
             intent.putExtra(KEY_LIST_WIDGET_CLICK, NOTE_LIST_WIDGET_SIGN_IN_TAPPED);
             intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
             PendingIntent pendingIntent = PendingIntent.getActivity(context, appWidgetId, intent, PendingIntent.FLAG_IMMUTABLE);
             views.setOnClickPendingIntent(R.id.widget_layout, pendingIntent);
 
             // Reset intent to navigate to note editor on note list add button click to navigate to notes activity, which redirects to login/signup
-            Intent intentButton = new Intent(context, NotesActivity.class);
+            Intent intentButton = IntentUtils.maybeAliasedIntent(context);
             views.setOnClickPendingIntent(R.id.widget_button, PendingIntent.getActivity(context, appWidgetId, intentButton, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE));
 
             views.setTextViewText(R.id.widget_text, context.getResources().getString(R.string.log_in_use_widget));
@@ -136,7 +137,7 @@ private void updateWidget(Context context, AppWidgetManager appWidgetManager, in
 
             if (cursor.getCount() > 0) {
                 // Create intent to navigate to notes activity on widget click while loading
-                Intent intentLoading = new Intent(context, NotesActivity.class);
+                Intent intentLoading = IntentUtils.maybeAliasedIntent(context);
                 intentLoading.putExtra(KEY_LIST_WIDGET_CLICK, NOTE_LIST_WIDGET_TAPPED);
                 intentLoading.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
                 PendingIntent pendingIntentLoading = PendingIntent.getActivity(context, appWidgetId, intentLoading, PendingIntent.FLAG_IMMUTABLE);
@@ -159,7 +160,7 @@ private void updateWidget(Context context, AppWidgetManager appWidgetManager, in
                 views.setPendingIntentTemplate(R.id.widget_list, pendingIntentItem);
 
                 // Create intent to navigate to note editor on note list add button click
-                Intent intentButton = new Intent(context, NotesActivity.class);
+                Intent intentButton = IntentUtils.maybeAliasedIntent(context);
                 intentButton.putExtra(KEY_LIST_WIDGET_CLICK, NOTE_LIST_WIDGET_BUTTON_TAPPED);
                 intentButton.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
                 PendingIntent pendingIntentButton = PendingIntent.getActivity(context, appWidgetId, intentButton, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
@@ -172,14 +173,14 @@ private void updateWidget(Context context, AppWidgetManager appWidgetManager, in
                 views.setViewVisibility(R.id.widget_list, View.VISIBLE);
             } else {
                 // Create intent to navigate to notes activity on widget click
-                Intent intent = new Intent(context, NotesActivity.class);
+                Intent intent = IntentUtils.maybeAliasedIntent(context);
                 intent.putExtra(KEY_LIST_WIDGET_CLICK, NOTE_LIST_WIDGET_TAPPED);
                 intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
                 PendingIntent pendingIntent = PendingIntent.getActivity(context, appWidgetId, intent, PendingIntent.FLAG_IMMUTABLE);
                 views.setOnClickPendingIntent(R.id.widget_layout, pendingIntent);
 
                 // Create intent to navigate to note editor on note list add button click
-                Intent intentButton = new Intent(context, NotesActivity.class);
+                Intent intentButton = IntentUtils.maybeAliasedIntent(context);
                 intentButton.putExtra(KEY_LIST_WIDGET_CLICK, NOTE_LIST_WIDGET_BUTTON_TAPPED);
                 intentButton.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
                 PendingIntent pendingIntentButton = PendingIntent.getActivity(context, appWidgetId, intentButton, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
diff --git a/Simplenote/src/main/java/com/automattic/simplenote/NoteWidgetDark.java b/Simplenote/src/main/java/com/automattic/simplenote/NoteWidgetDark.java
index ea0213a46..02fbbafe7 100644
--- a/Simplenote/src/main/java/com/automattic/simplenote/NoteWidgetDark.java
+++ b/Simplenote/src/main/java/com/automattic/simplenote/NoteWidgetDark.java
@@ -22,6 +22,7 @@
 import com.automattic.simplenote.analytics.AnalyticsTracker;
 import com.automattic.simplenote.models.Note;
 import com.automattic.simplenote.utils.ChecklistUtils;
+import com.automattic.simplenote.utils.IntentUtils;
 import com.automattic.simplenote.utils.PrefUtils;
 import com.simperium.Simperium;
 import com.simperium.client.Bucket;
@@ -108,7 +109,7 @@ private void updateWidget(Context context, AppWidgetManager appWidgetManager, in
 
         if (user.getStatus().equals(User.Status.NOT_AUTHORIZED)) {
             // Create intent to navigate to notes activity which redirects to login on widget click
-            Intent intent = new Intent(context, NotesActivity.class);
+            Intent intent = IntentUtils.maybeAliasedIntent(context);
             intent.putExtra(KEY_WIDGET_CLICK, NOTE_WIDGET_SIGN_IN_TAPPED);
             intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
             PendingIntent pendingIntent = PendingIntent.getActivity(context, appWidgetId, intent, PendingIntent.FLAG_IMMUTABLE);
diff --git a/Simplenote/src/main/java/com/automattic/simplenote/NoteWidgetLight.java b/Simplenote/src/main/java/com/automattic/simplenote/NoteWidgetLight.java
index 5ddc84308..6cd45fcdb 100644
--- a/Simplenote/src/main/java/com/automattic/simplenote/NoteWidgetLight.java
+++ b/Simplenote/src/main/java/com/automattic/simplenote/NoteWidgetLight.java
@@ -22,6 +22,7 @@
 import com.automattic.simplenote.analytics.AnalyticsTracker;
 import com.automattic.simplenote.models.Note;
 import com.automattic.simplenote.utils.ChecklistUtils;
+import com.automattic.simplenote.utils.IntentUtils;
 import com.automattic.simplenote.utils.PrefUtils;
 import com.simperium.Simperium;
 import com.simperium.client.Bucket;
@@ -108,7 +109,7 @@ private void updateWidget(Context context, AppWidgetManager appWidgetManager, in
 
         if (user.getStatus().equals(User.Status.NOT_AUTHORIZED)) {
             // Create intent to navigate to notes activity which redirects to login on widget click
-            Intent intent = new Intent(context, NotesActivity.class);
+            Intent intent = IntentUtils.maybeAliasedIntent(context);
             intent.putExtra(KEY_WIDGET_CLICK, NOTE_WIDGET_SIGN_IN_TAPPED);
             intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
             PendingIntent pendingIntent = PendingIntent.getActivity(context, appWidgetId, intent, PendingIntent.FLAG_IMMUTABLE);
diff --git a/Simplenote/src/main/java/com/automattic/simplenote/PreferencesFragment.java b/Simplenote/src/main/java/com/automattic/simplenote/PreferencesFragment.java
index ff18090ba..f38a1d390 100644
--- a/Simplenote/src/main/java/com/automattic/simplenote/PreferencesFragment.java
+++ b/Simplenote/src/main/java/com/automattic/simplenote/PreferencesFragment.java
@@ -17,13 +17,17 @@
 
 import android.app.Activity;
 import android.app.Fragment;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.ParcelFileDescriptor;
+import android.widget.Switch;
 import android.widget.Toast;
 
 import androidx.appcompat.app.AlertDialog;
@@ -237,6 +241,23 @@ public boolean onPreferenceClick(Preference preference) {
             }
         });
 
+        final SwitchPreferenceCompat sustainerIconPreference = findPreference("pref_key_sustainer_icon");
+        try {
+            if (
+                mPreferencesBucket.get(PREFERENCES_OBJECT_KEY).getCurrentSubscriptionPlatform() != null &&
+                Build.VERSION.SDK_INT >= Build.VERSION_CODES.P
+            ) {
+                sustainerIconPreference.setVisible(true);
+                sustainerIconPreference.setOnPreferenceChangeListener((preference, newValue) -> {
+                    toggleSustainerAppIcon((boolean) newValue);
+
+                    return true;
+                });
+            }
+        } catch (BucketObjectMissingException e) {
+            sustainerIconPreference.setVisible(false);
+        }
+
         final Preference membershipPreference = findPreference("pref_key_membership");
         membershipPreference.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
             @Override
@@ -347,6 +368,30 @@ public boolean onPreferenceClick(Preference preference) {
         });
     }
 
+    private void toggleSustainerAppIcon(boolean enabled) {
+        Context context = getContext();
+        if (context == null) {
+            return;
+        }
+
+        PackageManager packageManager = context.getPackageManager();
+        String componentPackage = BuildConfig.DEBUG ? "com.automattic.simplenote.debug" : "com.automattic.simplenote";
+
+        ComponentName mainComponent = new ComponentName(componentPackage, "com.automattic.simplenote.NotesActivity");
+        packageManager.setComponentEnabledSetting(
+                mainComponent,
+                enabled ? PackageManager.COMPONENT_ENABLED_STATE_DISABLED : PackageManager.COMPONENT_ENABLED_STATE_ENABLED,
+                PackageManager.DONT_KILL_APP
+        );
+
+        ComponentName sustainerComponent = new ComponentName(componentPackage, "com.automattic.simplenote.NotesActivitySustainerAlias");
+        packageManager.setComponentEnabledSetting(
+                sustainerComponent,
+                enabled ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED : PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
+                PackageManager.DONT_KILL_APP
+        );
+    }
+
     private void showProgressDialogDeleteAccount() {
         FragmentActivity activity = getActivity();
         if (activity == null) {
diff --git a/Simplenote/src/main/java/com/automattic/simplenote/utils/IntentUtils.java b/Simplenote/src/main/java/com/automattic/simplenote/utils/IntentUtils.java
new file mode 100644
index 000000000..b654daf3b
--- /dev/null
+++ b/Simplenote/src/main/java/com/automattic/simplenote/utils/IntentUtils.java
@@ -0,0 +1,27 @@
+package com.automattic.simplenote.utils;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+
+public class IntentUtils {
+    public static String getMainActivityClassName(Context context) {
+        String packageName = context.getPackageName();
+        Intent launchIntent = context.getPackageManager().getLaunchIntentForPackage(packageName);
+        if (launchIntent != null && launchIntent.getComponent() != null) {
+            ComponentName componentName = launchIntent.getComponent();
+            return componentName.getClassName();
+        }
+
+        return "com.simplenote.automattic.NotesActivity";
+    }
+
+    public static Intent maybeAliasedIntent(Context context) {
+        String packageName = context.getPackageName();
+
+        Intent intent = new Intent();
+        intent.setComponent(new ComponentName(packageName, getMainActivityClassName(context)));
+
+        return intent;
+    }
+}
diff --git a/Simplenote/src/main/res/drawable/ic_launcher_foreground_green.xml b/Simplenote/src/main/res/drawable/ic_launcher_foreground_green.xml
new file mode 100644
index 000000000..e6fa349d1
--- /dev/null
+++ b/Simplenote/src/main/res/drawable/ic_launcher_foreground_green.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="108dp"
+    android:width="108dp"
+    android:viewportHeight="108.0"
+    android:viewportWidth="108.0">
+
+    <path
+        android:fillColor="@color/green_sustainer"
+        android:pathData="M52.5,57.8c-11.7-3.2-18.7-11.9-17.8-22.2c0-0.1,0-0.2,0-0.3C29.9,40,27,46.6,27,54C27,68,38.4,80.1,51.7,80.5c3,0.1,5.8-0.7,8.1-2.6c2.3-1.9,3.7-4.7,4-7.7C64.4,62.3,57,59,52.5,57.8L52.5,57.8z">
+    </path>
+
+    <path
+        android:fillColor="@color/green_sustainer"
+        android:pathData="M80.3,54C80.3,40,69.2,28,56,27.4c-2.6-0.1-5.2,0.6-7.2,2.3c-2,1.7-3.3,4.1-3.5,6.8c-0.5,5.9,4.8,9.6,10,11c12.6,3.4,19.8,12.3,19.1,23.2C78.1,66.1,80.3,60.3,80.3,54L80.3,54z">
+    </path>
+
+</vector>
diff --git a/Simplenote/src/main/res/mipmap-anydpi-v26/ic_launcher_green.xml b/Simplenote/src/main/res/mipmap-anydpi-v26/ic_launcher_green.xml
new file mode 100644
index 000000000..50d9f4421
--- /dev/null
+++ b/Simplenote/src/main/res/mipmap-anydpi-v26/ic_launcher_green.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<adaptive-icon
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <background
+        android:drawable="@drawable/ic_launcher_background">
+    </background>
+
+    <foreground
+        android:drawable="@drawable/ic_launcher_foreground_green">
+    </foreground>
+
+</adaptive-icon>
diff --git a/Simplenote/src/main/res/values/colors.xml b/Simplenote/src/main/res/values/colors.xml
index 907d029b2..e46ca47f7 100644
--- a/Simplenote/src/main/res/values/colors.xml
+++ b/Simplenote/src/main/res/values/colors.xml
@@ -177,6 +177,7 @@
     <color name="green_80">#00450c</color>
     <color name="green_90">#003008</color>
     <color name="green_100">#001c05</color>
+    <color name="green_sustainer">#328a19</color>
     <color name="orange_0">#f5ece6</color>
     <color name="orange_5">#f7dcc6</color>
     <color name="orange_10">#ffbf86</color>
diff --git a/Simplenote/src/main/res/values/strings.xml b/Simplenote/src/main/res/values/strings.xml
index de465eb06..c89fb76d5 100644
--- a/Simplenote/src/main/res/values/strings.xml
+++ b/Simplenote/src/main/res/values/strings.xml
@@ -123,6 +123,7 @@
     <string name="detect_links">Detect links</string>
     <string name="share_analytics">Share analytics</string>
     <string name="share_analytics_summary">Help us improve Simplenote by sharing usage data with our analytics tool. %1$sLearn more%2$s</string>
+    <string name="sustainer_app_icon">Sustainer app icon</string>
 
     <!-- Tags -->
     <string name="add_tag">Add Tag</string>
diff --git a/Simplenote/src/main/res/xml/preferences.xml b/Simplenote/src/main/res/xml/preferences.xml
index ee1fd5efd..15ae53fde 100644
--- a/Simplenote/src/main/res/xml/preferences.xml
+++ b/Simplenote/src/main/res/xml/preferences.xml
@@ -59,6 +59,13 @@
             tools:summary="@string/style_classic">
         </Preference>
 
+        <SwitchPreferenceCompat
+            android:key="pref_key_sustainer_icon"
+            android:defaultValue="false"
+            android:title="@string/sustainer_app_icon"
+            app:isPreferenceVisible="false">
+        </SwitchPreferenceCompat>
+
     </PreferenceCategory>
 
     <PreferenceCategory