diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 35d497aedbc533e9046de663d2b709ccda1f9871..8fe587bbd8bac81eb007bbee4d389404807ff43b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -308,6 +308,19 @@
             </intent-filter>
         </activity>
 
+        <activity android:name=".FindMyDeviceActivity"
+                  android:label="@string/activity_label_empty"
+                  android:excludeFromRecents="true"
+                  android:configChanges="mcc|mnc"
+                  android:immersive="true"
+                  android:exported="false"
+                  android:windowSoftInputMode="stateAlwaysHidden">
+            <intent-filter>
+                <action android:name="org.lineageos.setupwizard.E_FIND_MY_DEVICE_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+		
         <activity android:name=".backup.RestoreIntroActivity"
                   android:label="@string/activity_label_empty"
                   android:excludeFromRecents="true"
diff --git a/res/drawable/ic_find_my_device.xml b/res/drawable/ic_find_my_device.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f3b506e99df4e306d59136a174d2601233214eca
--- /dev/null
+++ b/res/drawable/ic_find_my_device.xml
@@ -0,0 +1,28 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
+    android:viewportWidth="42"
+    android:viewportHeight="42"
+    android:width="42dp"
+    android:height="42dp">
+    <path
+        android:pathData="M33.25 1.75H15.75C13.825 1.75 12.25 3.325 12.25 5.25V8.75H15.75V7H33.25V35H15.75V33.25H12.25L12.25 36.75C12.25 38.675 13.825 40.25 15.75 40.25H33.25C35.175 40.25 36.75 38.675 36.75 36.75V5.25C36.75 3.325 35.175 1.75 33.25 1.75Z"
+        android:fillColor="@color/e_accent" />
+    <path
+        android:pathData="M14.7945 13.8886C18.1115 14.2545 20.7445 16.8875 21.1104 20.2045H22.749V21.7954H21.1104C20.7445 25.1125 18.1115 27.7454 14.7945 28.1113V29.75H13.2036V28.1113C9.88652 27.7454 7.25357 25.1125 6.88766 21.7954H5.24902V20.2045H6.88766C7.25357 16.8875 9.88652 14.2545 13.2036 13.8886V12.25H14.7945V13.8886ZM9.62483 21C9.62483 18.5828 11.5826 16.625 13.9998 16.625C16.417 16.625 18.3748 18.5828 18.3748 21C18.3748 23.4172 16.417 25.375 13.9998 25.375C11.5826 25.375 9.62483 23.4172 9.62483 21Z"
+        android:fillType="evenOdd"
+        android:fillColor="@color/e_accent" />
+    <path
+        android:pathData="M14 19.25C13.0331 19.25 12.25 20.0331 12.25 21C12.25 21.9669 13.0331 22.75 14 22.75C14.9669 22.75 15.75 21.9669 15.75 21C15.75 20.0331 14.9669 19.25 14 19.25Z"
+        android:fillColor="@color/e_accent" />
+    <path
+        android:pathData="M19.25 19.25H22.75V22.75H19.25V19.25Z"
+        android:fillColor="@color/e_accent" />
+    <path
+        android:pathData="M12.25 12.25H15.75V15.75H12.25V12.25Z"
+        android:fillColor="@color/e_accent" />
+    <path
+        android:pathData="M5.25 19.25H8.75V22.75H5.25V19.25Z"
+        android:fillColor="@color/e_accent" />
+    <path
+        android:pathData="M12.25 26.25H15.75V29.75H12.25V26.25Z"
+        android:fillColor="@color/e_accent" />
+</vector>
\ No newline at end of file
diff --git a/res/layout/setup_find_my_device.xml b/res/layout/setup_find_my_device.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6532057271480f792c053cce6e3f82ec4b037886
--- /dev/null
+++ b/res/layout/setup_find_my_device.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2018-2025 E FOUNDATION
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<com.google.android.setupdesign.GlifLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/setup_wizard_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        style="@style/SudContentFrame">
+
+        <FrameLayout android:id="@+id/page"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1">
+
+            <ScrollView android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:fillViewport="true">
+
+                <LinearLayout
+                    android:orientation="vertical"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:textSize="16sp"
+                        android:textColor="?android:attr/textColorPrimary"
+                        android:text="@string/find_my_device_setup_summary_part_1" />
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:textSize="16sp"
+                        android:textColor="?android:attr/textColorPrimary"
+                        android:text="@string/find_my_device_setup_summary_part_2" />
+
+                    <Button
+                        android:id="@+id/activate_find_my_device"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/activate_find_my_device"
+                        android:textSize="14sp"
+                        android:textAllCaps="true"
+                        android:layout_marginEnd="16dp"
+                        android:layout_marginStart="16dp"
+                        android:layout_marginTop="80dp"
+                        style="@style/SudGlifButton.Primary" />
+                </LinearLayout>
+            </ScrollView>
+        </FrameLayout>
+
+        <org.lineageos.setupwizard.NavigationLayout
+            android:id="@+id/navigation_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:showSkipButton="false" />
+
+    </LinearLayout>
+</com.google.android.setupdesign.GlifLayout>
diff --git a/res/raw/lineage_wizard_script.xml b/res/raw/lineage_wizard_script.xml
index 40d99a439830bbf4666ff07979b8af6c4cd08c3d..679bd659faeaaf6094901a18c81c7e0e89a28c9f 100644
--- a/res/raw/lineage_wizard_script.xml
+++ b/res/raw/lineage_wizard_script.xml
@@ -79,6 +79,12 @@
     <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCKSCREEN_SETTINGS;end" id="lockscreen_settings">
         <result wizard:action="e_account_manager_settings" />
     </WizardAction>
+	
+    <WizardAction
+        wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.E_FIND_MY_DEVICE_SETTINGS;end"
+        id="e_find_my_device_settings">
+        <result wizard:action="theme_settings" />
+    </WizardAction>
 
     <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.E_ACCOUNT_MANAGER_SETTINGS;end" id="e_account_manager_settings">
         <result wizard:action="finish" />
diff --git a/res/values-de/e_strings.xml b/res/values-de/e_strings.xml
index 4bf83e2ae7f610ff5097f06831b5f5a9ea1f82aa..246c145e2331c36c84518bfa756b13f5463e9fee 100644
--- a/res/values-de/e_strings.xml
+++ b/res/values-de/e_strings.xml
@@ -27,4 +27,9 @@
     <string name="activate_parental_control">Elternaufsicht aktivieren</string>
     <string name="parental_control_setup_title">Elternaufsicht einstellen</string>
     <string name="parental_control_setup_summary">Diese App bietet einen Schutz gegen unangemessene Inhalte für Ihre Kinder und Jugendliche. Sie können diese Funktion aktivieren, wenn Sie Ihr Gerät den Kindern leihen oder wenn das Gerät für sie bestimmt ist. Für mehr Informationen besuchen Sie bitte</string>
+	
+	<string name="activate_find_my_device">Find my Device aktivieren</string>
+	<string name="find_my_device_setup_title">Find my Device einrichten</string>
+	<string name="find_my_device_setup_summary_part_1">Find my Device hilft Ihnen, den Standort dieses Telefons zu ermitteln, falls Sie es verlegt haben.</string>
+	<string name="find_my_device_setup_summary_part_2">Erstellen Sie einen Geheimcode und senden Sie ihn einfach per SMS an dieses Gerät. Es antwortet automatisch mit den Koordinaten Ihres Telefons.</string>	
 </resources>
\ No newline at end of file
diff --git a/res/values-es/e_strings.xml b/res/values-es/e_strings.xml
index a93ffd2d8a3e0b09b500e267eac84d7c0962de5e..d36b92bfc7f9aa19cc3f9b0aa2eb4bd64546348e 100644
--- a/res/values-es/e_strings.xml
+++ b/res/values-es/e_strings.xml
@@ -24,4 +24,9 @@
     <string name="e_account_manager_setup_configure">Iniciar sesión</string>
     <string name="e_account_manager_setup_summary">Inicia sesión con tu ID de e.email o murena.io para conectar tu cuenta personal con este teléfono. Esto te permitirá sincronizar tus correos electrónicos, contactos, calendario, imágenes, vídeos, notas y tareas entre este teléfono y tu nube personal.</string>
     <string name="e_account_manager_setup_title">Sincroniza tu cuenta en la nube</string>
+	
+	<string name="activate_find_my_device">Activar Find my Device</string>
+	<string name="find_my_device_setup_title">Configurar Find my Device</string>
+	<string name="find_my_device_setup_summary_part_1">Find my Device le ayudará a localizar este teléfono en caso de pérdida.</string>
+	<string name="find_my_device_setup_summary_part_2">Genere un código secreto y envíelo simplemente por SMS a este dispositivo; responderá automáticamente con las coordenadas de su teléfono.</string>
 </resources>
\ No newline at end of file
diff --git a/res/values-fr/e_strings.xml b/res/values-fr/e_strings.xml
index f6dc02dc0f4c27b94620ca4874bfa0169304dd96..c338677bc4c5c40d311f6e794627a8188a53e093 100644
--- a/res/values-fr/e_strings.xml
+++ b/res/values-fr/e_strings.xml
@@ -26,5 +26,9 @@
     <string name="update_recovery_title_e">Mettre à jour le Recovery</string>
     <string name="parental_control_setup_summary">Cette application propose une protection contre les contenus inappropriés pour vos enfants et adolescents. Vous pouvez activer cette fonctionnalité quand vous prêtez votre téléphone à votre enfant ou si cela est leur appareil. Pour en savoir plus à ce sujet, veuillez aller sur</string>
     <string name="parental_control_setup_title">Paramétrez le Contrôle Parental</string>
-    <string name="activate_parental_control">Activez le Contrôle Parental</string>
+	
+	<string name="activate_find_my_device">Activer Find my Device</string>
+	<string name="find_my_device_setup_title">Configurer Find my Device</string>
+	<string name="find_my_device_setup_summary_part_1">Find my Device vous aidera à retrouver l\'emplacement de ce téléphone en cas de perte.</string>
+	<string name="find_my_device_setup_summary_part_2">Générez un code secret, envoyez-le simplement à cet appareil par SMS, et il répondra automatiquement avec les coordonnées de votre téléphone.</string>
 </resources>
\ No newline at end of file
diff --git a/res/values-it/e_strings.xml b/res/values-it/e_strings.xml
index b69860cbc5bd08939fb2c2235ffcb90f5fd71ea0..73fd25e577c5355740c0735a68e63bdd22fd9fc9 100644
--- a/res/values-it/e_strings.xml
+++ b/res/values-it/e_strings.xml
@@ -24,4 +24,9 @@
 \n/e/OS</string>
     <string name="sign_in">Accedi</string>
     <string name="create_account">Crea Account</string>
+	
+	<string name="activate_find_my_device">Attiva Find my Device</string>
+	<string name="find_my_device_setup_title">Configura Find my Device</string>
+	<string name="find_my_device_setup_summary_part_1">Find my Device ti aiuterà a individuare la posizione di questo telefono in caso di smarrimento.</string>
+	<string name="find_my_device_setup_summary_part_2">Genera un codice segreto e invialo semplicemente tramite SMS a questo dispositivo; risponderà automaticamente al messaggio con le coordinate del tuo telefono.</string>
 </resources>
\ No newline at end of file
diff --git a/res/values/e_strings.xml b/res/values/e_strings.xml
index ba1d0434ba503f40e27e7616987dc404753272e7..479d6de358ad0960de73f53b79c9c4feca5b00f0 100644
--- a/res/values/e_strings.xml
+++ b/res/values/e_strings.xml
@@ -27,4 +27,10 @@
     <string name="parental_control_setup_title">Set up Parental Control</string>
     <string name="parental_control_setup_summary">This app offers protection against inappropriate content for your children and teenagers. You can activate this feature when lending your phone to your kid or if this is their device. To know more about it please go to</string>
     <string name="more_info_text" translatable="false">https://doc.e.foundation/support-topics/parental-control</string>
+
+    <!-- Find my device -->
+    <string name="activate_find_my_device">Activate Find my Device</string>
+    <string name="find_my_device_setup_title">Set up Find my Device</string>
+    <string name="find_my_device_setup_summary_part_1">Find my device will help you reveal this phone\'s location in case you can\'t find it.</string>
+    <string name="find_my_device_setup_summary_part_2">Generate a secret code and simply send it to this device via SMS and it will automatically reply to your message with your phone\'s coordinates.</string>
 </resources>
\ No newline at end of file
diff --git a/src/org/lineageos/setupwizard/FindMyDeviceActivity.java b/src/org/lineageos/setupwizard/FindMyDeviceActivity.java
new file mode 100644
index 0000000000000000000000000000000000000000..8317c3a6e0c2de40674e70f19f657189e1d104c4
--- /dev/null
+++ b/src/org/lineageos/setupwizard/FindMyDeviceActivity.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2024 MURENA SAS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.lineageos.setupwizard;
+
+import static org.lineageos.setupwizard.SetupWizardApp.FIND_MY_DEVICE_COMPONENTNAME;
+import static org.lineageos.setupwizard.SetupWizardApp.REQUEST_CODE_FIND_MY_DEVICE;
+
+import android.content.Intent;
+import android.net.Uri;
+import android.view.View;
+import android.os.Bundle;
+
+import android.util.Log;
+
+import org.lineageos.setupwizard.util.SetupWizardUtils;
+
+public class FindMyDeviceActivity extends SubBaseActivity {
+
+    public static final String TAG = FindMyDeviceActivity.class.getSimpleName();
+
+    private boolean hasTelephonySupport = true;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        if (!SetupWizardUtils.hasTelephony(this)) {
+            Log.v(TAG, "Has no telephony support");
+            hasTelephonySupport = false;
+            onNavigateNext();
+            return;
+        }
+        
+        setNextText(R.string.skip);
+    }
+
+    @Override
+    public void onRestart() {
+        super.onRestart();
+        
+        if (!hasTelephonySupport) {
+            onNavigateNext();
+            return;
+        }
+    }
+
+
+    @Override
+    protected void onStartSubactivity() {
+        setNextAllowed(true);
+        findViewById(R.id.activate_find_my_device).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Log.v(TAG, "lauch find my device");
+                launchFindMyDevice();
+            }
+        });
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (data != null && data.getBooleanExtra("onBackPressed", false)) {
+            onStartSubactivity();
+            return;
+        // Check for back press
+        } else if(resultCode == RESULT_OK) {
+            onNavigateNext();
+        }
+    }
+
+    @Override
+    protected int getLayoutResId() {
+        return R.layout.setup_find_my_device;
+    }
+
+    @Override
+    protected int getTitleResId() {
+        return R.string.find_my_device_setup_title;
+    }
+
+    @Override
+    protected int getIconResId() {
+        return R.drawable.ic_find_my_device;
+    }
+
+    private void launchFindMyDevice() {
+        Intent intent = new Intent();
+        intent.setComponent(FIND_MY_DEVICE_COMPONENTNAME);
+        startActivityForResult(intent, REQUEST_CODE_FIND_MY_DEVICE);
+    }
+}
diff --git a/src/org/lineageos/setupwizard/SetupWizardApp.java b/src/org/lineageos/setupwizard/SetupWizardApp.java
index ade5b3226678067078cc5800aa952dd3b19dc4ad..41968206a5119f154f56b5a5595a2a72edb9273c 100644
--- a/src/org/lineageos/setupwizard/SetupWizardApp.java
+++ b/src/org/lineageos/setupwizard/SetupWizardApp.java
@@ -82,10 +82,12 @@ public class SetupWizardApp extends Application {
     public static final int REQUEST_CODE_SETUP_ACCOUNT_TYPE_E = 11;
     public static final int REQUEST_CODE_CREATE_E_ACCOUNT = 1;
     public static final int REQUEST_CODE_PARENTAL_CONTROL = 12;
+    public static final int REQUEST_CODE_FIND_MY_DEVICE = 13;
 
     public static final int RADIO_READY_TIMEOUT = 10 * 1000;
 
     public static final ComponentName PARENTAL_COMPONENTNAME = new ComponentName("foundation.e.parentalcontrol", "foundation.e.parentalcontrol.MainActivity");
+    public static final ComponentName FIND_MY_DEVICE_COMPONENTNAME = new ComponentName("foundation.e.findmydevice", "foundation.e.findmydevice.activity.FindMyDeviceActivity");
 
     private static StatusBarManager sStatusBarManager;