diff --git a/app/build.gradle b/app/build.gradle
index 71d501315..787ccc8d5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -21,6 +21,7 @@ android {
         buildConfigField 'String', 'OONI_RUN_DASHBOARD_URL', '"https://run.test.ooni.org"'
         resValue "string", "APP_ID", 'org.openobservatory.ooniprobe'
 		resValue "string", "APP_NAME", "OONI Probe"
+		resValue "string", "RUN_V2_DOMAIN", "run.test.ooni.org"
 		buildConfigField 'String', 'SOFTWARE_NAME', 'BASE_SOFTWARE_NAME+IS_DEBUG'
 		buildConfigField 'String', 'COUNTLY_KEY', '"146836f41172f9e3287cab6f2cc347de3f5ddf3b"'
 		buildConfigField "boolean", "RUN_AUTOMATION", "false"
@@ -71,6 +72,7 @@ android {
             buildConfigField 'String', 'BASE_SOFTWARE_NAME', '"ooniprobe-android"'
             buildConfigField 'String', 'OONI_API_BASE_URL', '"https://api.prod.ooni.io"'
             buildConfigField 'String', 'OONI_RUN_DASHBOARD_URL', '"https://run-v2.ooni.org"'
+            resValue "string", "RUN_V2_DOMAIN", "run.ooni.org"
         }
         dev {
             dimension 'testing'
diff --git a/app/src/dw/kotlin/org/openobservatory/ooniprobe/activity/runtests/adapter/RunTestsExpandableListViewAdapter.kt b/app/src/dw/kotlin/org/openobservatory/ooniprobe/activity/runtests/adapter/RunTestsExpandableListViewAdapter.kt
index e31de403e..0e44b4ad1 100644
--- a/app/src/dw/kotlin/org/openobservatory/ooniprobe/activity/runtests/adapter/RunTestsExpandableListViewAdapter.kt
+++ b/app/src/dw/kotlin/org/openobservatory/ooniprobe/activity/runtests/adapter/RunTestsExpandableListViewAdapter.kt
@@ -61,6 +61,7 @@ class RunTestsExpandableListViewAdapter(
         convertView.findViewById<ImageView>(R.id.child_select).apply {
             visibility = View.GONE
         }
+        convertView.setPadding(parent.context.resources.getDimensionPixelOffset(R.dimen.item_padding_prefix), 0, 0, 0)
         return convertView
     }
 }
\ No newline at end of file
diff --git a/app/src/dw/res/drawable/ooni_phone.xml b/app/src/dw/res/drawable/ooni_phone.xml
new file mode 100644
index 000000000..43a08e8d8
--- /dev/null
+++ b/app/src/dw/res/drawable/ooni_phone.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/logo" />
+</layer-list>
\ No newline at end of file
diff --git a/app/src/dw/res/layout/activity_prompt.xml b/app/src/dw/res/layout/activity_prompt.xml
new file mode 100644
index 000000000..e4e37fb79
--- /dev/null
+++ b/app/src/dw/res/layout/activity_prompt.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingHorizontal="16dp"
+    tools:context=".activity.PromptActivity"
+    android:background="@color/onboarding_background">
+
+    <ImageView
+        android:id="@+id/image"
+        android:layout_width="250dp"
+        android:layout_height="250dp"
+        android:paddingTop="50dp"
+        android:paddingBottom="50dp"
+        android:src="@drawable/logo"
+        android:contentDescription="@string/APP_NAME"
+        app:layout_constraintBaseline_toTopOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <TextView
+        android:id="@+id/title"
+        style="@style/TextAppearance.MaterialComponents.Headline6"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/image"
+        tools:text="@tools:sample/lorem"
+        android:textColor="@android:color/white"/>
+
+    <TextView
+        android:id="@+id/description"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/title"
+        android:layout_marginVertical="8dp"
+        tools:text="@tools:sample/lorem"
+        android:textColor="@android:color/white"/>
+
+    <Button
+        android:id="@+id/sounds_great"
+        style="@style/TextAppearance.MaterialComponents.Body1"
+        android:layout_width="match_parent"
+        android:layout_height="64dp"
+        android:layout_marginHorizontal="64dp"
+        android:text="@string/Modal_SoundsGreat"
+        android:textAllCaps="false"
+        android:textColor="#002B54"
+        app:backgroundTint="@android:color/white"
+        app:cornerRadius="32dp"
+        app:layout_constraintBottom_toTopOf="@id/not_now"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <Button
+        android:id="@+id/not_now"
+        style="@style/Widget.MaterialComponents.Button.TextButton"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/Modal_NotNow"
+        android:textAllCaps="false"
+        android:textColor="@android:color/white"
+        app:layout_constraintBottom_toTopOf="@id/dont_ask_again"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <Button
+        android:id="@+id/dont_ask_again"
+        style="@style/Widget.MaterialComponents.Button.TextButton"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/Prompt_DontAskAgain"
+        android:textAllCaps="false"
+        android:textColor="@android:color/white"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        android:layout_marginBottom="16dp"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/dw/res/values/dimens.xml b/app/src/dw/res/values/dimens.xml
index 4e7c7d491..f70a9e0ef 100644
--- a/app/src/dw/res/values/dimens.xml
+++ b/app/src/dw/res/values/dimens.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="onboarding_image_margin_bottom">8dp</dimen>
+    <dimen name="item_padding_prefix">40dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/dw/res/xml/preferences_global.xml b/app/src/dw/res/xml/preferences_global.xml
index 6a536d88e..91a4b8110 100644
--- a/app/src/dw/res/xml/preferences_global.xml
+++ b/app/src/dw/res/xml/preferences_global.xml
@@ -6,10 +6,15 @@
 		android:icon="@drawable/notifications"
 		android:key="@string/notifications"
 		android:title="@string/Settings_Notifications_Label">
-		<SwitchPreferenceCompat
-			android:defaultValue="false"
-			android:key="@string/notifications_enabled"
-			android:title="@string/Settings_Notifications_Enabled" />
+			<SwitchPreferenceCompat
+				android:defaultValue="false"
+				android:key="@string/notifications_enabled"
+				android:title="@string/Settings_Notifications_Enabled" />
+			<SwitchPreferenceCompat
+				android:defaultValue="false"
+				app:iconSpaceReserved="false"
+				android:key="@string/test_progress_notifications_enabled"
+				android:title="@string/Prompt_EnableTestProgressNotifications_Title" />
 			<PreferenceCategory
 				android:title="@string/Modal_EnableNotifications_Paragraph"
 				app:iconSpaceReserved="false" />
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a64399232..f84201955 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -35,36 +35,6 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity
-            android:name=".activity.oonirun.OoniRunV2Activity"
-            android:exported="true"
-            android:parentActivityName=".activity.MainActivity"
-            android:theme="@style/Theme.MaterialComponents.Light.DarkActionBar.App.NoActionBar">
-            <intent-filter android:autoVerify="true">
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <action android:name="${applicationId}.nettest" />
-
-                <data
-                    android:host="run.test.ooni.org"
-                    android:pathPrefix="/v2"
-                    android:scheme="https" />
-            </intent-filter>
-
-            <intent-filter android:autoVerify="true">
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data
-                    android:host="runv2"
-                    android:scheme="ooni" />
-            </intent-filter>
-        </activity>
         <activity
             android:name=".activity.adddescriptor.AddDescriptorActivity"
             android:exported="false"
@@ -154,59 +124,6 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-        <activity
-            android:name=".activity.OoniRunActivity"
-            android:exported="true"
-            android:label=""
-            android:launchMode="singleTop"
-            android:parentActivityName=".activity.MainActivity"
-            android:screenOrientation="userPortrait"
-            android:theme="@style/Theme.MaterialComponents.Light.NoActionBar.App">
-            <intent-filter>
-                <action android:name="android.intent.action.SEND" />
-                <category android:name="android.intent.category.DEFAULT" />
-
-                <action android:name="${applicationId}.nettest" />
-
-                <data android:mimeType="text/plain" />
-            </intent-filter>
-            <intent-filter android:autoVerify="true">
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <action android:name="${applicationId}.nettest" />
-
-                <data
-                    android:host="run.ooni.io"
-                    android:pathPrefix="/nettest"
-                    android:scheme="https" />
-            </intent-filter>
-            <intent-filter android:autoVerify="true">
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <action android:name="${applicationId}.nettest" />
-
-                <data
-                    android:host="run.ooni.io"
-                    android:pathPrefix="/nettest"
-                    android:scheme="http" />
-            </intent-filter>
-            <intent-filter android:autoVerify="true">
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data
-                    android:host="nettest"
-                    android:scheme="ooni" />
-            </intent-filter>
-        </activity>
 
         <activity
             android:name=".activity.LogActivity"
@@ -220,11 +137,18 @@
             </intent-filter>
         </activity>
 
+
+        <activity
+            android:name=".activity.PromptActivity"
+            android:theme="@style/Theme.MaterialComponents.NoActionBar.Onboarding"
+            android:exported="false" />
+
         <service
             android:name=".common.service.RunTestService"
             android:foregroundServiceType="dataSync"
             android:icon="@drawable/notification_icon"
             android:label="@string/Dashboard_Card_Run" />
+
         <service
             android:name=".common.service.RunTestJobService"
             android:label="Run Test Service"
diff --git a/app/src/main/java/org/openobservatory/ooniprobe/activity/MainActivity.java b/app/src/main/java/org/openobservatory/ooniprobe/activity/MainActivity.java
index bdff7a2a7..ac02e5bbb 100644
--- a/app/src/main/java/org/openobservatory/ooniprobe/activity/MainActivity.java
+++ b/app/src/main/java/org/openobservatory/ooniprobe/activity/MainActivity.java
@@ -5,6 +5,7 @@
 import static org.openobservatory.ooniprobe.common.service.RunTestService.CHANNEL_ID;
 
 import android.Manifest;
+import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -81,9 +82,6 @@ public class MainActivity extends ReviewUpdatesAbstractActivity implements Confi
     @Inject
     AppUpdatesViewModel updatesViewModel;
 
-    private ActivityResultLauncher<String> requestPermissionLauncher;
-
-
     public static Intent newIntent(Context context, int resItem) {
         return new Intent(context, MainActivity.class).putExtra(RES_ITEM, resItem).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
     }
@@ -144,14 +142,9 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
                         .withExtra(AUTOTEST_DIALOG)
                         .build().show(getSupportFragmentManager(), null);
             } else if (notificationManager.shouldShow()) {
-                new ConfirmDialogFragment.Builder()
-                        .withTitle(getString(R.string.Modal_EnableNotifications_Title))
-                        .withMessage(getString(R.string.Modal_EnableNotifications_Paragraph))
-                        .withPositiveButton(getString(R.string.Modal_SoundsGreat))
-                        .withNegativeButton(getString(R.string.Modal_NotNow))
-                        .withNeutralButton(getString(R.string.Modal_DontAskAgain))
-                        .withExtra(NOTIFICATION_DIALOG)
-                        .build().show(getSupportFragmentManager(), null);
+                    registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
+                        if (result.getResultCode() == Activity.RESULT_OK) {}
+                    }).launch(PromptActivity.newIntent(this, PromptActivity.Prompt.CENSORSHIP_CONSENT));
             }
             ThirdPartyServices.checkUpdates(this);
             scheduleWorkers();
@@ -167,7 +160,6 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
             }
         }
         onNewIntent(getIntent());
-        requestNotificationPermission();
     }
 
     private void scheduleWorkers() {
@@ -225,43 +217,6 @@ public void fetchManualUpdate() {
                 .observe(this, this::onManualUpdatesFetchComplete);
     }
 
-    private void requestNotificationPermission() {
-
-        requestPermissionLauncher = registerForActivityResult(
-                new ActivityResultContracts.RequestPermission(),
-                (result) -> {
-                    if (!result) {
-                        Snackbar.make(
-                                binding.getRoot(),
-                                "Please grant Notification permission from App Settings",
-                                Snackbar.LENGTH_LONG
-                                ).setAction(R.string.Settings_Title, view -> {
-                                    Intent intent = new Intent();
-                                    intent.setAction("android.settings.APP_NOTIFICATION_SETTINGS");
-                                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-
-                                    //for Android 5-7
-                                    intent.putExtra("app_package", getPackageName());
-                                    intent.putExtra("app_uid", getApplicationInfo().uid);
-
-                                    // for Android 8 and above
-                                    intent.putExtra("android.provider.extra.APP_PACKAGE", getPackageName());
-
-                                    startActivity(intent);
-                                }).show();
-                    }
-                }
-        );
-        NotificationUtility.setChannel(getApplicationContext(), CHANNEL_ID, getString(R.string.Settings_AutomatedTesting_Label), false, false, false);
-        if (ContextCompat.checkSelfPermission(
-                this,
-                Manifest.permission.POST_NOTIFICATIONS) != PackageManager.PERMISSION_GRANTED
-        ) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-                requestPermissionLauncher.launch(Manifest.permission.POST_NOTIFICATIONS);
-            }
-        }
-    }
 
     /**
      * Listens to updates from the {@link ManualUpdateDescriptorsWorker}.
@@ -360,17 +315,6 @@ protected void onNewIntent(Intent intent) {
     @Override
     public void onConfirmation(Serializable extra, int i) {
         if (extra == null) return;
-        if (extra.equals(NOTIFICATION_DIALOG)) {
-            notificationManager.getUpdates(i == DialogInterface.BUTTON_POSITIVE);
-
-            //If positive answer reload consents and init notification
-            if (i == DialogInterface.BUTTON_POSITIVE){
-                ThirdPartyServices.reloadConsents((Application) getApplication());
-            }
-            else if (i == DialogInterface.BUTTON_NEUTRAL){
-                notificationManager.disableAskNotificationDialog();
-            }
-        }
         if (extra.equals(AUTOTEST_DIALOG)) {
             preferenceManager.setNotificationsFromDialog(i == DialogInterface.BUTTON_POSITIVE);
             if (i == DialogInterface.BUTTON_POSITIVE) {
diff --git a/app/src/main/java/org/openobservatory/ooniprobe/activity/OverviewActivity.java b/app/src/main/java/org/openobservatory/ooniprobe/activity/OverviewActivity.java
index d4df1617c..2b165b9fb 100644
--- a/app/src/main/java/org/openobservatory/ooniprobe/activity/OverviewActivity.java
+++ b/app/src/main/java/org/openobservatory/ooniprobe/activity/OverviewActivity.java
@@ -49,6 +49,7 @@
 import org.openobservatory.ooniprobe.fragment.ConfirmDialogFragment;
 import org.openobservatory.ooniprobe.model.database.InstalledDescriptor;
 import org.openobservatory.ooniprobe.model.database.TestDescriptor;
+import org.openobservatory.ooniprobe.test.test.WebConnectivity;
 
 import java.io.Serializable;
 import java.util.Locale;
@@ -207,6 +208,10 @@ private void onDescriptorLoaded(AbstractDescriptor<BaseNettest> descriptor) {
 
         if (descriptor instanceof InstalledDescriptor installedDescriptor) {
             try {
+
+                if (installedDescriptor.allTests().size() == 1 && installedDescriptor.allTests().get(0).getName().equals(WebConnectivity.NAME)) {
+                    binding.expandableListView.setPadding(getResources().getDimensionPixelOffset(R.dimen.overview_test_group_list_padding_small),0,0,0);
+                }
                 if (Integer.parseInt(installedDescriptor.getTestDescriptor().getRevision()) > 1) {
                     getSupportFragmentManager().beginTransaction().replace(
                             binding.revisionsContainer.getId(),
diff --git a/app/src/main/java/org/openobservatory/ooniprobe/activity/PromptActivity.java b/app/src/main/java/org/openobservatory/ooniprobe/activity/PromptActivity.java
new file mode 100644
index 000000000..d3f069e1f
--- /dev/null
+++ b/app/src/main/java/org/openobservatory/ooniprobe/activity/PromptActivity.java
@@ -0,0 +1,218 @@
+package org.openobservatory.ooniprobe.activity;
+
+
+import android.Manifest;
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.os.Build;
+import android.os.Bundle;
+import android.view.View;
+
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
+import androidx.annotation.StringRes;
+import androidx.core.content.ContextCompat;
+
+import com.google.android.material.snackbar.Snackbar;
+
+import org.openobservatory.ooniprobe.R;
+import org.openobservatory.ooniprobe.databinding.ActivityPromptBinding;
+import org.openobservatory.ooniprobe.domain.UpdatesNotificationManager;
+
+import javax.inject.Inject;
+
+public class PromptActivity extends AbstractActivity {
+    private static final String PROMPT_ITEM = "promptItem";
+    @Inject
+    UpdatesNotificationManager notificationManager;
+    private ActivityPromptBinding binding;
+    private Prompt prompt;
+
+    private ActivityResultLauncher<String> requestPermissionLauncher;
+
+    public static Intent newIntent(Context context, Prompt prompt) {
+        return new Intent(context, PromptActivity.class).putExtra(PROMPT_ITEM, prompt);
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        getActivityComponent().inject(this);
+        binding = ActivityPromptBinding.inflate(getLayoutInflater());
+        setContentView(binding.getRoot());
+
+        prompt = (Prompt) getIntent().getExtras().get(PROMPT_ITEM);
+        binding.title.setText(prompt.title);
+        binding.description.setText(prompt.paragraph);
+
+        registerPermissionRequest();
+        setUpClickListeners();
+    }
+
+    private void registerPermissionRequest() {
+        requestPermissionLauncher = registerForActivityResult(new ActivityResultContracts.RequestPermission(), (result) -> {
+            if (!result) {
+                switch (prompt) {
+                    case CENSORSHIP_CONSENT:
+                        notificationManager.getUpdates(false);
+                        break;
+                    case TEST_PROGRESS_CONSENT:
+                        notificationManager.setTestProgressNotificationConsent(false);
+                        break;
+                }
+                Snackbar.make(binding.getRoot(), "Please grant Notification permission from App Settings", Snackbar.LENGTH_LONG).setAction(R.string.Settings_Title, view -> {
+                    launchAppNotificationSettings();
+                }).show();
+            }
+            setResult(result ? Activity.RESULT_OK : Activity.RESULT_CANCELED);
+            finish();
+        });
+    }
+
+    private void launchAppNotificationSettings() {
+        Intent intent = new Intent();
+        intent.setAction("android.settings.APP_NOTIFICATION_SETTINGS");
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+        //for Android 5-7
+        intent.putExtra("app_package", getPackageName());
+        intent.putExtra("app_uid", getApplicationInfo().uid);
+
+        // for Android 8 and above
+        intent.putExtra("android.provider.extra.APP_PACKAGE", getPackageName());
+
+        startActivity(intent);
+    }
+
+    private void setUpClickListeners() {
+        OnPromptAction actions;
+        switch (prompt) {
+            case CENSORSHIP_CONSENT:
+                actions = new InternetCensorshipConsentActions();
+                break;
+            case TEST_PROGRESS_CONSENT:
+                actions = new TestProgressNotificationConsentActions();
+                break;
+            default:
+                actions = new OnPromptAction() {
+                    @Override
+                    public void onClickPositive(View view) { /*No Implementation*/ }
+
+                    @Override
+                    public void onClickNeutral(View view) { /*No Implementation*/ }
+
+                    @Override
+                    public void onClickNegative(View view) { /*No Implementation*/ }
+                };
+        }
+
+        binding.soundsGreat.setOnClickListener(actions::onClickPositive);
+        binding.notNow.setOnClickListener(actions::onClickNeutral);
+        binding.dontAskAgain.setOnClickListener(actions::onClickNegative);
+    }
+
+    public void requestNotificationPermission() {
+        if (ContextCompat.checkSelfPermission(
+                this, Manifest.permission.POST_NOTIFICATIONS)
+                != PackageManager.PERMISSION_GRANTED) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                requestPermissionLauncher.launch(Manifest.permission.POST_NOTIFICATIONS);
+            }
+        }
+    }
+
+    public enum Prompt {
+        CENSORSHIP_CONSENT(R.string.Modal_EnableNotifications_Title, R.string.Modal_EnableNotifications_Paragraph),
+        TEST_PROGRESS_CONSENT(R.string.Prompt_EnableTestProgressNotifications_Title, R.string.Prompt_EnableTestProgressNotifications_Paragraph);
+
+        private final int title;
+        private final int paragraph;
+
+        Prompt(@StringRes int title, @StringRes int paragraph) {
+            this.title = title;
+            this.paragraph = paragraph;
+        }
+    }
+
+    interface OnPromptAction {
+        /**
+         * Callback for View#onClick of `soundsGreat` button.
+         *
+         * @param view The view that was clicked.
+         */
+        void onClickPositive(View view);
+
+        /**
+         * Callback for View#onClick of `notNow` button.
+         *
+         * @param view The view that was clicked.
+         */
+        void onClickNeutral(View view);
+
+        /**
+         * Callback for View#onClick of `dontAskAgain` button.
+         *
+         * @param view The view that was clicked.
+         */
+        void onClickNegative(View view);
+    }
+
+    private class InternetCensorshipConsentActions implements OnPromptAction {
+
+        @Override
+        public void onClickPositive(View view) {
+            notificationManager.getUpdates(true);
+            if (ContextCompat.checkSelfPermission(
+                    PromptActivity.this,
+                    Manifest.permission.POST_NOTIFICATIONS) != PackageManager.PERMISSION_GRANTED){
+                PromptActivity.this.requestNotificationPermission();
+            } else {
+                setResult(Activity.RESULT_OK);
+                finish();
+            }
+        }
+
+        @Override
+        public void onClickNeutral(View view) {
+            PromptActivity.this.setResult(Activity.RESULT_CANCELED);
+            PromptActivity.this.finish();
+        }
+
+        @Override
+        public void onClickNegative(View view) {
+            notificationManager.disableAskNotificationDialog();
+            onClickNeutral(view);
+        }
+    }
+
+    private class TestProgressNotificationConsentActions implements OnPromptAction {
+
+        @Override
+        public void onClickPositive(View view) {
+            notificationManager.setTestProgressNotificationConsent(true);
+            if (ContextCompat.checkSelfPermission(
+                    PromptActivity.this,
+                    Manifest.permission.POST_NOTIFICATIONS) != PackageManager.PERMISSION_GRANTED){
+                PromptActivity.this.requestNotificationPermission();
+            } else {
+                setResult(Activity.RESULT_OK);
+                finish();
+            }
+        }
+
+        @Override
+        public void onClickNeutral(View view) {
+            PromptActivity.this.setResult(Activity.RESULT_CANCELED);
+            PromptActivity.this.finish();
+        }
+
+        @Override
+        public void onClickNegative(View view) {
+            notificationManager.disableAskTestProgressNotificationConsent();
+            onClickNeutral(view);
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/openobservatory/ooniprobe/activity/RunningActivity.java b/app/src/main/java/org/openobservatory/ooniprobe/activity/RunningActivity.java
index eca1476b3..5951cfcd6 100644
--- a/app/src/main/java/org/openobservatory/ooniprobe/activity/RunningActivity.java
+++ b/app/src/main/java/org/openobservatory/ooniprobe/activity/RunningActivity.java
@@ -9,7 +9,6 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.graphics.drawable.ColorDrawable;
-import android.os.Build;
 import android.os.Bundle;
 import android.view.View;
 import android.view.animation.Animation;
@@ -72,6 +71,11 @@ public static void runAsForegroundService(AbstractActivity context,
                                               ArrayList<AbstractSuite> testSuites,
                                               OnTestServiceStartedListener onTestServiceStartedListener,
                                               PreferenceManager iPreferenceManager) {
+
+        if (iPreferenceManager.shouldShowTestProgressConsent()){
+            context.startActivity(PromptActivity.newIntent(context, PromptActivity.Prompt.TEST_PROGRESS_CONSENT));
+        }
+
         if (ReachabilityManager.getNetworkType(context).equals(ReachabilityManager.NO_INTERNET)) {
             new MessageDialogFragment.Builder()
                     .withTitle(context.getString(R.string.Modal_Error))
diff --git a/app/src/main/java/org/openobservatory/ooniprobe/activity/oonirun/OoniRunV2Activity.kt b/app/src/main/java/org/openobservatory/ooniprobe/activity/oonirun/OoniRunV2Activity.kt
index 6c45d8b13..05fa5a7a1 100644
--- a/app/src/main/java/org/openobservatory/ooniprobe/activity/oonirun/OoniRunV2Activity.kt
+++ b/app/src/main/java/org/openobservatory/ooniprobe/activity/oonirun/OoniRunV2Activity.kt
@@ -144,7 +144,7 @@ class OoniRunV2Activity : AbstractActivity() {
      * The run id can be in two different formats:
      *
      * 1. ooni://runv2/link_id
-     * 2. https://run.test.ooni.org/v2/link_id
+     * 2. https://[run.ooni.org||run.test.ooni.org]/v2/link_id
      *
      * The run id is the `link_id` in the link.
      * If the Uri contains a link, but the `link_id` is not a number, null is returned.
@@ -166,12 +166,12 @@ class OoniRunV2Activity : AbstractActivity() {
                     return uri.pathSegments[0].toLong()
                 }
 
-                "run.test.ooni.org" -> {
+                getString(R.string.RUN_V2_DOMAIN) -> {
                     /*
                      * The run id is the second segment of the path.
                      * Launched when the system recognizes this app can open this link
                      * and launches the app when a link is clicked.
-                     * e.g. https://run.test.ooni.org/v2/link_id
+                     * e.g. https://[run.ooni.org||run.test.ooni.org]/v2/link_id
                      */
                     return uri.pathSegments[1].toLong()
                 }
diff --git a/app/src/main/java/org/openobservatory/ooniprobe/common/OONIDescriptor.kt b/app/src/main/java/org/openobservatory/ooniprobe/common/OONIDescriptor.kt
index 0e133994e..8cf0c05cc 100644
--- a/app/src/main/java/org/openobservatory/ooniprobe/common/OONIDescriptor.kt
+++ b/app/src/main/java/org/openobservatory/ooniprobe/common/OONIDescriptor.kt
@@ -170,6 +170,10 @@ abstract class AbstractDescriptor<T : BaseNettest>(
     fun hasPreferencePrefix(): Boolean {
         return !(name == OONITests.EXPERIMENTAL.label || name == OONITests.WEBSITES.label)
     }
+
+    fun allTests(): List<BaseNettest> {
+        return nettests + (longRunningTests ?: listOf())
+    }
 }
 
 open class OONIDescriptor<T : BaseNettest>(
diff --git a/app/src/main/java/org/openobservatory/ooniprobe/common/PreferenceManager.java b/app/src/main/java/org/openobservatory/ooniprobe/common/PreferenceManager.java
index 32c60cff8..16e91edf6 100644
--- a/app/src/main/java/org/openobservatory/ooniprobe/common/PreferenceManager.java
+++ b/app/src/main/java/org/openobservatory/ooniprobe/common/PreferenceManager.java
@@ -29,6 +29,7 @@ public class PreferenceManager {
 	public static final int NOTIFICATION_DIALOG_COUNT = 7;
 	public static final int AUTOTEST_DIALOG_COUNT = 5;
 	static final String NOTIFICATION_DIALOG_DISABLE = "isNotificationDialogDisabled";
+	static final String TEST_PROGRESS_NOTIFICATION_DISABLE = "isTestProgressNotificationDisabled";
 	private static final String AUTOTEST_DIALOG_DISABLE = "isAutomaticTestDialogDisabled";
 	private static final String TOKEN = "token";
 	static final String SHOW_ONBOARDING = "first_run";
@@ -117,6 +118,31 @@ public boolean isNotifications() {
 		return sp.getBoolean(r.getString(R.string.notifications_enabled), false);
 	}
 
+	public boolean isTestProgressNotifications() {
+		return sp.getBoolean(r.getString(R.string.test_progress_notifications_enabled), false);
+	}
+
+	public boolean isAskTestProgressNotificationConsent() {
+		return sp.getBoolean(TEST_PROGRESS_NOTIFICATION_DISABLE, false);
+	}
+
+	public void disableAskTestProgressNotificationConsent() {
+		sp.edit().putBoolean(TEST_PROGRESS_NOTIFICATION_DISABLE, true)
+				.apply();
+	}
+
+	public void setTestProgressNotificationConsent(boolean enabled) {
+		//set notification value and increment app open
+		sp.edit()
+				.putBoolean(r.getString(R.string.test_progress_notifications_enabled), enabled)
+				.apply();
+	}
+
+	public boolean shouldShowTestProgressConsent() {
+		return !isTestProgressNotifications()
+				&& !isAskTestProgressNotificationConsent();
+	}
+
 	public boolean isDarkTheme() {
 		return sp.getBoolean(r.getString(R.string.theme_enabled), false);
 	}
diff --git a/app/src/main/java/org/openobservatory/ooniprobe/common/service/RunTestService.java b/app/src/main/java/org/openobservatory/ooniprobe/common/service/RunTestService.java
index f211c3d18..d434722c6 100644
--- a/app/src/main/java/org/openobservatory/ooniprobe/common/service/RunTestService.java
+++ b/app/src/main/java/org/openobservatory/ooniprobe/common/service/RunTestService.java
@@ -201,6 +201,9 @@ public void stopTest() {
      */
     public synchronized void interrupt() {
         task.interrupt();
+        if (task.isInterrupted()) {
+            ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE);
+        }
     }
 
     private class ProgressBroadcastReceiver extends BroadcastReceiver {
diff --git a/app/src/main/java/org/openobservatory/ooniprobe/di/ActivityComponent.java b/app/src/main/java/org/openobservatory/ooniprobe/di/ActivityComponent.java
index 4564b7124..ff5a4592d 100644
--- a/app/src/main/java/org/openobservatory/ooniprobe/di/ActivityComponent.java
+++ b/app/src/main/java/org/openobservatory/ooniprobe/di/ActivityComponent.java
@@ -6,6 +6,7 @@
 import org.openobservatory.ooniprobe.activity.MeasurementDetailActivity;
 import org.openobservatory.ooniprobe.activity.OoniRunActivity;
 import org.openobservatory.ooniprobe.activity.OverviewActivity;
+import org.openobservatory.ooniprobe.activity.PromptActivity;
 import org.openobservatory.ooniprobe.activity.ProxyActivity;
 import org.openobservatory.ooniprobe.activity.ResultDetailActivity;
 import org.openobservatory.ooniprobe.activity.RunningActivity;
@@ -36,4 +37,5 @@ public interface ActivityComponent {
     void inject(TextActivity activity);
     void inject(LogActivity activity);
     void inject(RunTestsActivity activity);
+    void inject(PromptActivity activity);
 }
diff --git a/app/src/main/java/org/openobservatory/ooniprobe/domain/UpdatesNotificationManager.java b/app/src/main/java/org/openobservatory/ooniprobe/domain/UpdatesNotificationManager.java
index da20fd3f7..3a4790381 100644
--- a/app/src/main/java/org/openobservatory/ooniprobe/domain/UpdatesNotificationManager.java
+++ b/app/src/main/java/org/openobservatory/ooniprobe/domain/UpdatesNotificationManager.java
@@ -34,4 +34,12 @@ public void getUpdates(boolean notificationUpdates) {
     public void disableAskNotificationDialog() {
         pm.disableAskNotificationDialog();
     }
+
+    public void disableAskTestProgressNotificationConsent() {
+        pm.disableAskTestProgressNotificationConsent();
+    }
+
+    public void setTestProgressNotificationConsent(boolean enabled) {
+        pm.setTestProgressNotificationConsent(enabled);
+    }
 }
diff --git a/app/src/main/java/org/openobservatory/ooniprobe/fragment/DashboardFragment.kt b/app/src/main/java/org/openobservatory/ooniprobe/fragment/DashboardFragment.kt
index 01099370c..dbee80fbe 100644
--- a/app/src/main/java/org/openobservatory/ooniprobe/fragment/DashboardFragment.kt
+++ b/app/src/main/java/org/openobservatory/ooniprobe/fragment/DashboardFragment.kt
@@ -121,6 +121,11 @@ class DashboardFragment : Fragment(), View.OnClickListener {
 
         binding.testsCompleted.isVisible = updatesViewModel.testRunComplete.value ?: false
 
+        if ((requireActivity().application as Application).isTestRunning) {
+            binding.runAll.visibility = View.GONE
+            binding.lastTested.visibility = View.GONE
+        }
+
     }
 
     fun updateDescriptors() {
diff --git a/app/src/main/java/org/openobservatory/ooniprobe/fragment/PreferenceFragment.java b/app/src/main/java/org/openobservatory/ooniprobe/fragment/PreferenceFragment.java
index a3de2c4b8..e3daa7f45 100644
--- a/app/src/main/java/org/openobservatory/ooniprobe/fragment/PreferenceFragment.java
+++ b/app/src/main/java/org/openobservatory/ooniprobe/fragment/PreferenceFragment.java
@@ -2,10 +2,12 @@
 
 import static org.openobservatory.ooniprobe.common.PreferenceManager.COUNT_WEBSITE_CATEGORIES;
 
+import android.Manifest;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -17,10 +19,14 @@
 import android.view.MenuItem;
 import android.widget.Toast;
 
+import androidx.activity.result.ActivityResultCallerLauncher;
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.IdRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.XmlRes;
+import androidx.core.content.ContextCompat;
 import androidx.preference.EditTextPreference;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;
@@ -48,6 +54,7 @@ public class PreferenceFragment extends ExtendedPreferenceFragment<PreferenceFra
     public static final String ARG_PREFERENCES_RES_ID = "org.openobservatory.ooniprobe.fragment.PreferenceFragment.PREF_RES_ID";
     private static final String ARG_CONTAINER_RES_ID = "org.openobservatory.ooniprobe.fragment.PreferenceFragment.CONTAINER_VIEW_ID";
     private String rootKey;
+    private ActivityResultLauncher<String> requestPermissionLauncher;
 
     public static PreferenceFragment newInstance(@XmlRes int preferencesResId, @IdRes int preferencesContainerResId, String rootKey) {
         PreferenceFragment fragment = new PreferenceFragment();
@@ -59,6 +66,12 @@ public static PreferenceFragment newInstance(@XmlRes int preferencesResId, @IdRe
         return fragment;
     }
 
+    @Override
+    public void onAttach(@NonNull Context context) {
+        requestPermissionLauncher = registerForActivityResult(new ActivityResultContracts.RequestPermission(), (result) -> {});
+        super.onAttach(context);
+    }
+
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         this.rootKey = rootKey;
@@ -171,9 +184,19 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, Strin
         if (key.equals(getString(R.string.automated_testing_charging)) ||
                 key.equals(getString(R.string.automated_testing_wifionly))){
             //stop and re-enable scheduler in case of wifi charging option changed
+
             ServiceUtil.stopJob(getContext());
             ServiceUtil.scheduleJob(getContext());
         }
+        if (key.equals(getString(R.string.test_progress_notifications_enabled))){
+            if (ContextCompat.checkSelfPermission(
+                    getContext(), Manifest.permission.POST_NOTIFICATIONS)
+                    != PackageManager.PERMISSION_GRANTED) {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                    requestPermissionLauncher.launch(Manifest.permission.POST_NOTIFICATIONS);
+                }
+            }
+        }
         if (key.equals(getString(R.string.send_crash)) ||
                 key.equals(getString(R.string.notifications_enabled))){
             ThirdPartyServices.reloadConsents((Application) getActivity().getApplication());
diff --git a/app/src/main/res/drawable/ooni_phone.xml b/app/src/main/res/drawable/ooni_phone.xml
new file mode 100644
index 000000000..231083216
--- /dev/null
+++ b/app/src/main/res/drawable/ooni_phone.xml
@@ -0,0 +1,141 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="174dp"
+    android:height="120dp"
+    android:viewportWidth="174"
+    android:viewportHeight="120">
+  <path
+      android:pathData="M93.49,70.76C93.26,62.84 98.14,62.64 103,58.37C109.36,52.78 113.39,45.1 113.29,36.52C112.91,21.38 101.66,7.65 83.96,9.44C71.26,10.73 61.78,20.11 60.02,33.09C57.77,49.72 77.86,61.87 62.01,73"
+      android:fillColor="#0588CB"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M81.86,34.15C82.49,33.87 80.66,30.99 85.67,24.95C87.7,22.51 91.47,21.06 95.04,20.84C99.72,20.54 103.67,24.33 103.67,24.33C102.8,21.57 98.08,19.9 95.24,19.76C92.71,19.64 90.02,20.49 88.23,21.76C80.27,27.37 81.86,34.15 81.86,34.15Z"
+      android:fillColor="#2391CB"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M82.95,34.12C83.55,33.87 82.01,31.81 87.01,26.98C89.03,25.03 92.61,23.73 95.94,23.36C100.31,22.87 103.27,25.16 103.27,25.16C102.13,23.12 98.82,22.48 96.19,22.54C93.85,22.59 91.31,23.4 89.56,24.43C81.96,28.92 82.95,34.12 82.95,34.12Z"
+      android:fillColor="#108CCB"
+      android:fillType="evenOdd"/>
+  <group>
+    <clip-path
+        android:pathData="M0.08,54.1H76.08V85.8H0.08V54.1Z"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M54.84,66.41C53.09,67.18 43.26,71.94 39.63,73.36C31.14,75.8 23.52,76.37 17.14,74.48C12.36,73.06 9.82,68.92 9.59,67.55C9.11,64.81 9.23,63.27 10.22,62.05C10.8,61.34 11.61,60.61 13.05,60.16C13.81,59.92 14.94,60.02 15.6,60.39C15.96,60.58 16.27,61.05 16.27,61.05C16.74,62.46 17.99,62.4 18.32,60.3C18.43,59.6 18.52,58.88 18.11,58.31C17.74,57.77 17.11,56.62 16.07,56.24C15.85,56.16 14.34,55.65 13.64,55.15C12.96,54.65 12.1,54.44 11.24,54.24C9.36,53.8 8.91,54.52 7.11,55.03C6.59,55.18 6.17,55.56 5.81,55.91C5.03,56.67 4.21,57.39 3.32,58.08C2.58,58.64 1.92,59.36 1.54,60.1C1.14,60.86 0.75,60.97 0.44,61.76C0.08,62.69 1,63.85 0.43,64.87C-0.49,66.49 0.7,67.23 0.83,68.23C0.99,69.45 -0.31,71.18 0.87,71.54C1.89,71.84 2.42,72.31 2.65,73.07C2.9,73.91 4.5,75.59 5.25,76.41C6.22,77.48 7.41,78.51 8.53,79.28C24.62,90.27 44.18,84.37 47.69,82.97C50.77,81.74 55,79.96 59.57,78.64L75.9,74.87C75.9,74.87 79.53,55.52 54.84,66.41Z"
+        android:fillColor="#0588CB"
+        android:fillType="evenOdd"/>
+  </group>
+  <path
+      android:pathData="M9.15,54.11C12.68,53.54 13.21,55.39 15.06,55.86C17.31,56.43 17.74,57.77 18.11,58.31C18.52,58.88 16.45,57.71 15.53,57.48C15.02,57.34 13.55,56.29 11.37,55.94C9.83,55.7 8.68,56.43 7.51,56.56C6.9,56.62 5.06,56.93 6.26,55.66C7.07,54.81 9.15,54.11 9.15,54.11Z"
+      android:fillColor="#2391CB"
+      android:fillType="evenOdd"/>
+  <group>
+    <clip-path
+        android:pathData="M32.82,4.02H81.78V70.43H32.82V4.02Z"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M65.81,70.01C61.83,71.18 54.58,69.58 52.23,68.97C48.3,67.96 43.6,65.29 38.99,61.43C35.23,58.28 32.59,52.92 32.84,44.83C33.02,39.07 37.64,33.92 41.06,32.15C44.56,30.33 44.75,30.8 46.29,30.05C49.39,28.52 49.61,25.64 48.65,24.64C47.96,23.93 47.99,19.11 48.3,17.87C48.47,17.18 48.69,16.5 48.99,15.84C49.29,15.18 49.34,14.56 49.02,13.83C48.39,12.43 49.91,11.9 51.02,10.53C51.71,9.68 52.14,8.61 52.75,7.66C53.31,6.78 53.4,6.44 54.68,5.88C55.62,5.48 56.73,5.33 57.62,4.82C59.05,4.01 59.5,3.61 60.74,4.63C61.2,5.01 61.92,4.67 62.49,4.69C64.94,4.77 65.21,4.99 66.91,6.63C67.56,7.25 69.11,8.01 69.99,8.31C72.6,9.24 74.37,5.21 74.55,8.28C74.69,10.68 71.72,12.34 70.05,12.59C67.8,12.93 67.25,12.09 65.22,11.29C62.63,10.27 60.1,8.8 58.31,11.46C57.53,12.61 57.5,14.01 57.5,15.49C57.5,17.73 57.27,19.18 57.99,22.61C58.62,25.58 57.72,30.24 55.34,33.04C52.77,36.05 50.71,35.77 46.68,40.28C42.09,45.41 47.77,53.88 53.5,56.14C57.98,57.91 62.17,57.22 65.86,54.98C69.55,52.74 75.23,47.92 77.86,43C81.62,35.96 83.56,51.48 79.6,59.68C75.64,67.88 69.88,68.81 65.81,70.01Z"
+        android:fillColor="#0588CB"
+        android:fillType="evenOdd"/>
+  </group>
+  <path
+      android:pathData="M73.35,69C74.43,68.35 74.64,67.73 73.47,67.9C51.41,71.1 35.52,57.28 35.52,57.28C36.57,60.27 41.16,63.16 43.16,64.59C46.68,67.09 45.98,66.34 50.5,68.46L54.38,69.47C54.38,69.47 55.75,73.8 46.04,78.58C39.99,81.56 27.89,85.06 12.52,78.78C5.01,75.72 0.83,68.23 0.83,68.23C0.99,69.45 -0.31,71.18 0.87,71.54C1.89,71.84 2.42,72.31 2.65,73.07C2.9,73.91 4.5,75.59 5.25,76.41C6.22,77.48 7.41,78.52 8.53,79.28C25.34,90.66 44.06,84 47.69,82.97C51.02,82.02 55.04,80.11 59.57,78.64L74.82,74.8L73.35,69Z"
+      android:fillColor="#065D89"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M45.14,43.42C45.14,43.42 45.75,41.31 46.68,40.28C50.71,35.77 52.72,36.34 55.34,33.04C55.34,33.04 54.71,32.61 50.85,34.82C46.99,37.04 44.27,40.23 45.14,43.42Z"
+      android:fillColor="#065D89"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M49.02,13.83C49.34,14.56 49.29,15.18 48.99,15.84C48.68,16.5 48.47,17.18 48.3,17.87C47.99,19.11 47.96,23.93 48.65,24.64C49.28,25.3 49.2,26.74 48.36,28.35C48.36,28.35 50.54,26.47 50.29,24.25C50.05,22.02 49.49,20.11 49.94,17.89C50.26,16.31 48.71,13.13 49.02,13.83Z"
+      android:fillColor="#065D89"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M33.2,43.45C34.05,38.54 38.37,34.18 41.23,32.39C42.56,31.57 43.36,31.43 45.26,30.46C45.26,30.46 37.36,35.83 36.19,39.78C35.07,43.53 33.07,44.15 33.2,43.45Z"
+      android:fillColor="#2391CB"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M57.47,17.2C57.47,17.2 57.43,20.72 56.99,22.41C56.52,24.21 57.2,25.65 57.78,25.81C57.78,25.81 58.51,23.94 58.36,22.19C58.2,20.27 57.47,17.2 57.47,17.2Z"
+      android:fillColor="#2391CB"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M55.27,6.44C54.28,6.66 56.39,5.5 57.28,4.99C58.71,4.18 59.5,3.61 60.74,4.63C61.2,5.01 61.68,4.67 62.25,4.69C64.7,4.76 65.21,4.99 66.91,6.63C67.56,7.25 69.11,8.01 69.99,8.31C72.6,9.24 74.37,5.21 74.55,8.28C74.62,9.48 73.68,10.73 72.18,11.14C71.03,11.46 67.3,10.62 64.98,8.17C63.27,6.36 59.39,5.54 55.27,6.44Z"
+      android:fillColor="#2391CB"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M123.31,100.03C134.02,90.56 132.19,82.87 129.84,71.34C128.58,65.19 135.21,61.22 140.48,62.14C142.2,62.44 142.02,67.33 143.82,66.39C146.21,65.14 146.64,61.97 145.72,59.7C142.9,52.84 126.24,54.16 123.27,58.92C121.59,61.62 119.39,64.42 120.53,69.69C121.12,72.43 120.7,75.53 120.95,78.84C124.43,91.5 107.87,97.56 100.68,88.36C95.84,82.15 92.42,71.08 93.75,64.01C95.82,52.93 88.58,62.06 83.61,69.53C81.18,74.37 81.48,73.99 83.64,81.81C85.57,88.79 90.48,97.3 96.67,101.14C103.51,105.38 113.86,106.69 123.31,100.03C128.45,95.69 122.47,100.77 123.31,100.03Z"
+      android:fillColor="#0588CB"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M121.33,80.76C121.76,84.71 119.57,90.87 112.6,92.5C107.3,93.74 101.31,89.95 101,90.62C99.1,94.66 111.61,98.64 118.58,93C122.57,89.77 121.33,80.76 121.33,80.76Z"
+      android:fillColor="#2391CB"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M145.13,57.63C142.12,54.66 137.01,53.41 134.44,53.84C133.84,53.94 133.25,53.96 132.67,53.67C131.12,52.88 129.28,54.14 128.01,55.26C127.21,55.97 125.99,55.7 125.12,56.31C123.93,57.15 123.32,59.46 122.3,60.47C122.3,60.47 123.84,59.55 127.38,57.48C128.88,56.6 130.6,56.23 134.18,55.57C137.77,54.91 146.11,58.58 145.13,57.63Z"
+      android:fillColor="#2391CB"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M146.33,67.32C148.37,61.28 145.13,57.63 145.13,57.63L141.52,55.68L142.62,62.69C144.24,65.25 137.67,71.17 138.6,72.02C139.53,72.86 144.1,71.56 146.33,67.32Z"
+      android:fillColor="#0588CB"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M146.16,67.64C144.51,71.08 139.92,73.07 138.43,71.93C138.43,71.93 142.24,72.01 145.3,66.72C146.87,64 146.96,62.43 146.96,62.43C146.96,62.43 147.55,64.73 146.16,67.64Z"
+      android:fillColor="#065D89"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M131.09,77.17C130.25,73.81 129.06,70.7 130.4,66.81C125.05,72.63 129.77,75.92 129.42,82.55C129.11,88.46 127.25,96.59 122.71,98.64C102.44,107.82 88.25,92.1 82.94,79.2C86.76,93.88 96.68,107.3 113.4,104.13C125.94,101.74 134.38,90.44 131.09,77.17Z"
+      android:fillColor="#065D89"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M65.77,54.32C65.77,54.32 67.17,56.96 72.11,58.41C72.11,58.41 66.62,58.18 64.12,56.01C64.79,55.32 65.77,54.32 65.77,54.32Z"
+      android:fillColor="#065D89"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M69.21,70.93C68.59,73.97 65.22,82.68 62.4,89.29C58.59,98.2 49.42,108.83 37.92,110.13C37.02,110.21 36.12,110.23 35.23,110.18C32.54,110.06 29.91,109.68 27.4,108.32C26.41,107.78 25.44,107.13 24.5,106.36C23.02,104.41 21.1,103.07 20.23,100.27C20.09,100.06 20.02,98.53 18.94,97.45C18.64,97.15 17.34,97.07 17.02,96.75C16.69,96.44 16.7,95.31 16.37,95C15.8,94.46 14.91,94.76 14.42,94.34C13.63,93.65 13.03,93.19 12.85,93.2C11.2,93.03 8.38,90.37 5.64,93.72C5.25,94.19 4.55,95.52 5.42,96.93C6.86,99.27 6.19,96.44 7,95.68C7.72,95 10.46,95.94 12.51,99.96C13.64,102.16 14.58,104.83 14.89,105.82C15.82,109.25 17.37,112.16 19.86,114.51C21.24,115.36 22.32,116.55 23.75,116.96C24.64,117.44 25.66,117.93 26.9,118.43C29.04,119.29 30.52,119.35 32,119.49C33.24,119.6 35.61,119.72 36.83,119.82C41.17,120.15 44.12,119.47 47.56,119.09C48.57,118.84 49.55,118.52 50.51,118.14C55.02,116.32 58.99,114.17 62.11,111.35C62.89,110.65 66.77,106.9 69.52,103.56C70.1,102.86 70.53,102.05 71.02,101.29C72.91,98.52 74.56,95.58 76.14,92.6C76.67,91.61 78.48,87.46 79.08,86.17C83.24,77.33 82.94,78 85.23,69.48C85.35,69.01 74.68,64.5 69.79,65.21C69.79,65.21 69.74,68.34 69.21,70.93Z"
+      android:fillColor="#0588CB"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M5.64,93.72C8.38,90.37 11.2,93.03 12.84,93.2C13.03,93.19 13.63,93.65 14.42,94.34C14.91,94.76 15.8,94.46 16.37,94.99C16.7,95.31 16.69,96.44 17.02,96.75C17.34,97.07 18.64,97.15 18.94,97.45C20.02,98.53 20.09,100.06 20.23,100.27C21.1,103.07 23.02,104.41 24.5,106.36C25.44,107.13 26.06,107.5 27.06,108.04C29.56,109.4 32.54,110.21 35.23,110.18C37.94,110.16 41.93,110 45.89,108.18C50.08,106.24 54.1,104.08 54.28,105.17C54.46,106.26 46.62,111.9 37.61,112.82C32.81,113.31 25.8,112.32 23.33,107.83C18.28,98.66 16.65,96.14 12.65,93.74C8.36,91.17 5.64,93.72 5.64,93.72Z"
+      android:fillColor="#2391CB"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M76.48,87.12C75.99,87.99 71.59,96.38 69.86,98.78C69.27,99.55 68.69,100.55 68.07,101.26C60.8,109.54 56.36,111.9 50.24,114.52C49.09,115.02 48.02,115.68 46.86,116.15C45.98,116.5 45.08,116.82 44.16,117.09C42.11,117.49 40.02,118 37.89,118.02C36.82,118.03 35.75,117.99 34.68,117.9C31.77,117.5 29.06,117.37 26.42,116.33C25.54,115.99 24.71,115.92 23.86,115.51C23.28,115.17 22.76,114.89 22.29,114.65H22.29C22.29,114.65 20.14,113.55 18.19,111.05C16.25,108.55 13.92,102.32 12.82,99.62C12.37,98.49 10.88,96.1 9.87,95.47C8.97,94.91 8.14,94.92 7.51,95.12C6.78,95.36 7,95.68 7,95.68C7.72,95 10.52,95.93 12.62,100.27C13.69,102.5 14.58,104.83 14.89,105.82C15.82,109.25 17.37,112.16 19.86,114.51C22.56,116.53 24.82,117.97 27.27,118.57C30.3,119.32 32.21,119.5 35.65,119.75C36.64,119.86 37.63,119.94 38.63,119.98C41.62,120.1 46.18,119.74 49.36,118.72C53.71,117.33 57.79,114.98 60.72,112.51C61.45,111.89 62.12,111.31 62.82,110.66C65.59,108.41 67.45,106.33 69.58,103.26C70.06,102.52 70.52,101.78 70.97,101.03C73.03,97.92 74.77,95.26 76.57,92.1C77.03,91.31 81.5,80.18 81.93,79.38C84.68,73.87 79.93,81 76.48,87.12Z"
+      android:fillColor="#065D89"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M66.62,83.34C68.12,77.73 66.97,75.41 74.22,71.08C77.89,68.89 75.97,73.86 69.88,85.03C68.29,87.95 65.12,93.01 64.36,92.58C61.57,90.98 66.34,84.39 66.62,83.34Z"
+      android:fillColor="#2391CB"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M61.81,57.84C58.03,58.12 56.46,58.51 52,57.01C49.17,55.58 47.09,54.31 45.56,50.94C44.42,48.43 44.3,45.75 43.57,48.01C42.54,51.19 45.57,55.65 47.48,57.08C51.32,59.95 54.53,61.34 59.39,60.99C65.97,60.51 64.6,57.64 61.81,57.84Z"
+      android:fillColor="#2391CB"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M101.09,49.6C107.44,47.27 110.7,40.24 108.38,33.89C106.05,27.53 99.02,24.27 92.67,26.59C86.32,28.92 83.06,35.95 85.38,42.3C87.71,48.66 94.74,51.92 101.09,49.6Z"
+      android:fillColor="#065D89"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M100.87,49.01C106.9,46.8 110,40.13 107.79,34.1C105.59,28.07 98.91,24.98 92.89,27.18C86.86,29.39 83.77,36.06 85.97,42.09C88.18,48.12 94.85,51.21 100.87,49.01Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M88.51,45.96C83.92,32.94 95.38,24.46 105.37,30.14C100.38,25.08 93.57,25.35 89.08,29.54C84.38,33.91 84.13,41.27 88.51,45.96Z"
+      android:fillColor="#F5F5F5"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M104.36,34.89C103.75,33.21 101.89,32.35 100.22,32.96C98.55,33.58 97.69,35.43 98.3,37.11C98.91,38.78 100.77,39.64 102.44,39.03C104.11,38.41 104.97,36.56 104.36,34.89Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M137.5,45.05C134.57,53.51 130.61,62.17 126.73,60.84C121.17,58.94 117.28,56.82 112.25,67.44C107.22,78.06 115.7,79.37 121.09,81.21C127.3,83.34 140.96,71.79 148.89,48.94C156.82,26.09 153.21,8.63 147,6.51C141.61,4.67 134.12,0.52 131.5,11.96C128.87,23.4 133.25,24.11 138.81,26.01C142.69,27.34 140.44,36.58 137.5,45.05Z"
+      android:fillColor="#E67700"/>
+  <path
+      android:pathData="M126.08,78.52C132.29,80.64 140.96,71.79 148.89,48.94C156.82,26.08 152.08,12.52 151.58,12.52C152.08,18.02 152.22,29.52 148.89,41.52C144.58,58.52 139.08,71.52 126.08,78.52Z"
+      android:fillColor="#974E01"/>
+  <path
+      android:pathData="M134.7,23.28C133.49,22.6 133.34,22.28 132.5,21.67C132.03,21.32 131.45,20.56 131.09,20.14C131.09,23.59 136.13,25.41 139.26,26.11C139.01,25.77 137.64,24.63 137.31,24.43C135.93,23.85 136.31,24.18 134.7,23.28Z"
+      android:fillColor="#974E01"/>
+  <path
+      android:pathData="M122.9,100.13C133.6,90.66 131.78,82.96 129.42,71.43C128.66,67.7 127.67,61.67 129.67,60.12C129.68,60.04 130.17,56.62 130.17,56.62C127,57.4 124.1,57.03 122.86,59.02C121.18,61.72 118.97,64.51 120.12,69.79C120.71,72.52 120.28,75.62 120.54,78.93C124.01,91.6 107.46,97.66 100.27,88.45C95.42,82.24 92.01,71.18 93.33,64.11C95.41,53.03 88.17,62.16 83.19,69.62C80.77,74.47 81.07,74.09 83.23,81.91C85.16,88.89 90.07,97.4 96.26,101.24C103.09,105.48 113.45,106.79 122.9,100.13C128.03,95.78 122.06,100.86 122.9,100.13Z"
+      android:fillColor="#0588CB"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_overview.xml b/app/src/main/res/layout/activity_overview.xml
index 564947a65..7fa538d7f 100644
--- a/app/src/main/res/layout/activity_overview.xml
+++ b/app/src/main/res/layout/activity_overview.xml
@@ -217,14 +217,15 @@
                             android:id="@+id/header_container"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_marginStart="@dimen/item_padding_small"
-                            android:layout_marginEnd="@dimen/item_padding_small"
+                            android:layout_marginStart="@dimen/item_padding_large"
+                            android:layout_marginEnd="@dimen/item_padding_large"
                             android:layout_below="@+id/automatic_updates_container">
 
                             <ImageView
                                 android:id="@+id/switch_tests"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
+                                android:layout_marginStart="-8dp"
                                 android:padding="@dimen/item_padding_small"
                                 android:src="@drawable/check_box_outline_blank"
                                 app:tint="@color/color_blue4"
@@ -246,7 +247,7 @@
                         android:childDivider="@android:color/transparent"
                         android:divider="@android:color/transparent"
                         android:groupIndicator="@null"
-                        android:paddingStart="38dp"
+                        android:paddingStart="@dimen/overview_test_group_list_padding"
                         app:layout_constraintTop_toBottomOf="@id/header"
                         tools:listitem="@layout/overview_test_group_list_item" />
 
diff --git a/app/src/main/res/layout/activity_prompt.xml b/app/src/main/res/layout/activity_prompt.xml
new file mode 100644
index 000000000..e2aca58eb
--- /dev/null
+++ b/app/src/main/res/layout/activity_prompt.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingHorizontal="16dp"
+    tools:context=".activity.PromptActivity"
+    android:background="@color/onboarding_background">
+
+    <ImageView
+        android:id="@+id/image"
+        android:layout_width="250dp"
+        android:layout_height="250dp"
+        android:paddingTop="50dp"
+        android:paddingBottom="50dp"
+        android:src="@drawable/ooni_phone"
+        android:contentDescription="@string/APP_NAME"
+        app:layout_constraintBaseline_toTopOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <TextView
+        android:id="@+id/title"
+        style="@style/TextAppearance.MaterialComponents.Headline6"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/image"
+        tools:text="@tools:sample/lorem"
+        android:textColor="@android:color/white"/>
+
+    <TextView
+        android:id="@+id/description"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/title"
+        android:layout_marginVertical="8dp"
+        tools:text="@tools:sample/lorem"
+        android:textColor="@android:color/white"/>
+
+    <Button
+        android:id="@+id/sounds_great"
+        style="@style/TextAppearance.MaterialComponents.Body1"
+        android:layout_width="match_parent"
+        android:layout_height="64dp"
+        android:layout_marginHorizontal="64dp"
+        android:text="@string/Modal_SoundsGreat"
+        android:textAllCaps="false"
+        android:textColor="#002B54"
+        app:backgroundTint="@android:color/white"
+        app:cornerRadius="32dp"
+        app:layout_constraintBottom_toTopOf="@id/not_now"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <Button
+        android:id="@+id/not_now"
+        style="@style/Widget.MaterialComponents.Button.TextButton"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/Modal_NotNow"
+        android:textAllCaps="false"
+        android:textColor="@android:color/white"
+        app:layout_constraintBottom_toTopOf="@id/dont_ask_again"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <Button
+        android:id="@+id/dont_ask_again"
+        style="@style/Widget.MaterialComponents.Button.TextButton"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/Prompt_DontAskAgain"
+        android:textAllCaps="false"
+        android:textColor="@android:color/white"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        android:layout_marginBottom="16dp"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/overview_test_child_list_item.xml b/app/src/main/res/layout/overview_test_child_list_item.xml
index 2e7c96b9d..55285d8bb 100644
--- a/app/src/main/res/layout/overview_test_child_list_item.xml
+++ b/app/src/main/res/layout/overview_test_child_list_item.xml
@@ -5,6 +5,6 @@
     android:id="@+id/text"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingStart="16dp"
+    android:paddingStart="48dp"
     android:paddingTop="8dp"
     android:paddingBottom="8dp" />
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 5bf81981d..78d3d2e95 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -4,4 +4,6 @@
     <dimen name="item_padding_small">8dp</dimen>
     <dimen name="item_padding_large">16dp</dimen>
     <dimen name="onboarding_image_margin_bottom">0dp</dimen>
+    <dimen name="overview_test_group_list_padding">38dp</dimen>
+    <dimen name="overview_test_group_list_padding_small">8dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 40ecc8ac9..e0581598e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -533,4 +533,7 @@
   <string name="CategoryCode_CTRL_Description">Benign or innocuous content used for control</string>
   <string name="CategoryCode_IGO_Description">Intergovernmental organizations including The United Nations</string>
   <string name="CategoryCode_MISC_Description">Sites that haven\'t been categorized yet</string>
+  <string name="Prompt_DontAskAgain">Don’t ask again</string>
+  <string name="Prompt_EnableTestProgressNotifications_Title">Enable test progress notifications</string>
+  <string name="Prompt_EnableTestProgressNotifications_Paragraph">Would you like to enable notifications on OONI Probe test progress and display running tests in the notifications drawer?</string>
 </resources>
diff --git a/app/src/main/res/values/untraslatable.xml b/app/src/main/res/values/untraslatable.xml
index c0d4e5d99..af7f1c861 100644
--- a/app/src/main/res/values/untraslatable.xml
+++ b/app/src/main/res/values/untraslatable.xml
@@ -30,6 +30,7 @@
 	<string name="performance_datausage" translatable="false">5 - 200 MB</string>
 
 	<string name="notifications_enabled" translatable="false">notifications_enabled</string>
+	<string name="test_progress_notifications_enabled" translatable="false">test_progress_notifications_enabled</string>
 	<string name="notifications_completion" translatable="false">notifications_completion</string>
 	<string name="notifications_news" translatable="false">notifications_news</string>
 	<string name="automated_testing_enabled" translatable="false">automated_testing_enabled</string>
diff --git a/app/src/main/res/xml/preferences_global.xml b/app/src/main/res/xml/preferences_global.xml
index fef7d5a27..2eb6fdce1 100644
--- a/app/src/main/res/xml/preferences_global.xml
+++ b/app/src/main/res/xml/preferences_global.xml
@@ -8,8 +8,14 @@
 		android:title="@string/Settings_Notifications_Label">
 		<SwitchPreferenceCompat
 			android:defaultValue="false"
+			app:iconSpaceReserved="false"
 			android:key="@string/notifications_enabled"
-			android:title="@string/Settings_Notifications_Enabled" />
+			android:title="@string/Modal_EnableNotifications_Title" />
+		<SwitchPreferenceCompat
+			android:defaultValue="false"
+			app:iconSpaceReserved="false"
+			android:key="@string/test_progress_notifications_enabled"
+			android:title="@string/Prompt_EnableTestProgressNotifications_Title" />
 			<PreferenceCategory
 				android:title="@string/Modal_EnableNotifications_Paragraph"
 				app:iconSpaceReserved="false" />
diff --git a/app/src/ooni/AndroidManifest.xml b/app/src/ooni/AndroidManifest.xml
new file mode 100644
index 000000000..820b044ff
--- /dev/null
+++ b/app/src/ooni/AndroidManifest.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools">
+    <application
+        android:name=".common.Application"
+        android:allowBackup="false"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/APP_NAME"
+        android:supportsRtl="true"
+        android:theme="@style/Theme.MaterialComponents.Light.DarkActionBar.App">
+        <activity
+            android:name=".activity.oonirun.OoniRunV2Activity"
+            android:exported="true"
+            android:parentActivityName=".activity.MainActivity"
+            android:theme="@style/Theme.MaterialComponents.Light.DarkActionBar.App.NoActionBar">
+            <intent-filter android:autoVerify="true">
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <action android:name="${applicationId}.nettest" />
+
+                <data
+                    android:host="@string/RUN_V2_DOMAIN"
+                    android:pathPrefix="/v2"
+                    android:scheme="https" />
+            </intent-filter>
+
+            <intent-filter android:autoVerify="true">
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="runv2"
+                    android:scheme="ooni" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".activity.OoniRunActivity"
+            android:exported="true"
+            android:label=""
+            android:launchMode="singleTop"
+            android:parentActivityName=".activity.MainActivity"
+            android:screenOrientation="userPortrait"
+            android:theme="@style/Theme.MaterialComponents.Light.NoActionBar.App">
+            <intent-filter>
+                <action android:name="android.intent.action.SEND" />
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <action android:name="${applicationId}.nettest" />
+
+                <data android:mimeType="text/plain" />
+            </intent-filter>
+            <intent-filter android:autoVerify="true">
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <action android:name="${applicationId}.nettest" />
+
+                <data
+                    android:host="run.ooni.io"
+                    android:pathPrefix="/nettest"
+                    android:scheme="https" />
+            </intent-filter>
+            <intent-filter android:autoVerify="true">
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <action android:name="${applicationId}.nettest" />
+
+                <data
+                    android:host="run.ooni.io"
+                    android:pathPrefix="/nettest"
+                    android:scheme="http" />
+            </intent-filter>
+            <intent-filter android:autoVerify="true">
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="nettest"
+                    android:scheme="ooni" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>